Merge pull request #91 from dynarithmic/master-staging

Master staging
dynarithmic · Jan 16, 2024 · dcaf6df · dcaf6df
2 parents aced64c + 666bc5f
commit dcaf6df
Show file tree

Hide file tree

Showing 36 changed files with 73 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 * The Dynarithmic TWAIN Library is open source and licensed under the Apache 2.0 License.  Please read the [LICENSE](https://github.com/dynarithmic/twain_library/tree/master/LICENSE) file for more information.
 * The DTWAIN Library online help file can be found [here](https://www.dynarithmic.com/onlinehelp/dtwain/newversion/Dynarithmic%20TWAIN%20Library,%20Version%205.x.html).
-* The current version is [**5.4.2** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
+* The current version is [**5.4.3** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
 
 **Please note that the source code and sample programs for the Dynarithmic TWAIN Library has moved to [this repository](https://github.com/dynarithmic/twain_library_source/tree/master)**.
 

diff --git a/binaries/32bit/32bit_FullDemo.zip b/binaries/32bit/32bit_FullDemo.zip
diff --git a/binaries/32bit/32bit_FullDemo_hash.txt b/binaries/32bit/32bit_FullDemo_hash.txt
@@ -1,4 +1,4 @@
-MD5: 13f91f94248536a0a4b74c0000419483
-SHA1: b3a884cd67bf0d87e030b387a3289afe70c6d880
-SHA256: 71afe10b44f579e19cc863a9d5b38aeaad06dfb8a55974bf8f7e5161c4add5c1
-SHA512: 5d6e6bdf6874154cf8bc15a9df80a32e671fd48436dfda6e9c42a42c18fbc703ff83f5cf9e9492474f67cc4c95eb43bdebb4a1e00fd6d189d3d74c94fc72c446
+MD5: eafe6b8c88d63fa722b94f79aa9a0a0c
+SHA1: 77ef3ee803553fdab84ab32ceedc813b7a541b2f
+SHA256: fc8f050d5ce858340ecfd88b705e15315bddeab0569fa763ed2720519d875711
+SHA512: c074680346f2596da7935004a4f5b36be1d2a74a7d3ce466bfdc0ef7986af9eb10067ed0f7914eaca4200c4647fc44195cbe2441b50761f0498ea0b004177853
diff --git a/binaries/32bit/release_libraries.zip b/binaries/32bit/release_libraries.zip
diff --git a/binaries/32bit/release_ziphashes32.txt b/binaries/32bit/release_ziphashes32.txt
@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = e96ff56ca3366d35bb31579cdb9ccc69
-SHA1 hash of "release_libraries.zip" (20 bytes) = fd10cab57aa3723f8dc5f75ded86bee6d74ed275
-SHA256 hash of "release_libraries.zip" (32 bytes) = 522501ee6ed69b311bd203557e205d7d95a1c6f596e201ff1c3f7de1b0b8e05c
+MD5 hash of "release_libraries.zip" (16 bytes) = 43f202a5e91d46a93fa20989b810a663
+SHA1 hash of "release_libraries.zip" (20 bytes) = 2987f5adc5c22204b55dbcb65ac9a6334fe93684
+SHA256 hash of "release_libraries.zip" (32 bytes) = 794d84899bd90f13e9ab02830032f2a89b08d88cabc9bf00cb0d5b2aeeea8e81
 
diff --git a/binaries/64bit/64bit_FullDemo.zip b/binaries/64bit/64bit_FullDemo.zip
diff --git a/binaries/64bit/64bit_FullDemo_hash.txt b/binaries/64bit/64bit_FullDemo_hash.txt
@@ -1,4 +1,4 @@
-MD5: 39d9689d424ccacf590adec5a035ac23
-SHA1: 56143dcc736d1b94cf21d7d9bb0c8d066c974eff
-SHA256: 184591ef544caa5704843b6fcfe2933165fb143f294904a0fa293a31f9d504b1
-SHA512: 99d903f652aa41f4752ea9cf2c3d3003ee9fcb3cc711c7aa0e0a360d0690f10ae58cf222fab17c1c653fbb856b76c1dafb7b7713bb7aa8bcb059d2837f17c2c9
+MD5: 8652c4b21aafc08c32412ad1348e316b
+SHA1: d0b6277734d824adb2a2717f14fe4bd9d3b1e94d
+SHA256: 25d11efdb95323885b613cb94eb4b438a58a554efbdfcf04f913fd491c64ba38
+SHA512: f179af7ed041151bc897f69587f0d9a05c916d3af2cadb7ec3ea5856d26333b4acafe850506cedf0f3dd506149a11f4b0d8d35a4c9db2039d4e3867f861e97d2
diff --git a/binaries/64bit/release_libraries.zip b/binaries/64bit/release_libraries.zip
diff --git a/binaries/64bit/release_ziphashes64.txt b/binaries/64bit/release_ziphashes64.txt
@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = c0bf11c8b94120777b9f598af19679b4
-SHA1 hash of "release_libraries.zip" (20 bytes) = 89e39ef0ee464d215e0f1d3228c21e65587695e5
-SHA256 hash of "release_libraries.zip" (32 bytes) = 0e33840f681ed0f8e45cd40bb90a5e93ee9f7d26b509e72f6840745ce70f3e02
+MD5 hash of "release_libraries.zip" (16 bytes) = 953edd59d810041c241064910d4598f7
+SHA1 hash of "release_libraries.zip" (20 bytes) = bf7f1a2c4e4ccc88b3758f11ab80540de83e5fab
+SHA256 hash of "release_libraries.zip" (32 bytes) = cb56870005297b67482107ca794f4dd4a1a587040ac30b7d31e2e11d644bf7e3
 
diff --git a/c_cpp_includes/capconst.h b/c_cpp_includes/capconst.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwain.h b/c_cpp_includes/dtwain.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwain_filetypes.h b/c_cpp_includes/dtwain_filetypes.h
@@ -1,6 +1,6 @@
 /*
 This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-Copyright (c) 2002-2023 Dynarithmic Software.
+Copyright (c) 2002-2024 Dynarithmic Software.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwain_library_selector.h b/c_cpp_includes/dtwain_library_selector.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwain_standard_defs.h b/c_cpp_includes/dtwain_standard_defs.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwain_version.h b/c_cpp_includes/dtwain_version.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      2
+#define DTWAIN_PATCHLEVEL_VERSION      3
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)

diff --git a/c_cpp_includes/dtwainc.h b/c_cpp_includes/dtwainc.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwaindefs.h b/c_cpp_includes/dtwaindefs.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwainx.h b/c_cpp_includes/dtwainx.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -944,6 +944,10 @@ DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedFileTypes(VOID_PROTOTYPE);
 DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedMultiPageFileTypes(VOID_PROTOTYPE);
 DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedSinglePageFileTypes(VOID_PROTOTYPE);
 
+/* Customize doubling the page count if acquiring in duplex mode */
+DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetDoublePageCountOnDuplex(DTWAIN_SOURCE Source, DTWAIN_BOOL bDoubleCount);
+DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsDoublePageCountOnDuplex(DTWAIN_SOURCE Source);
+
 #include "dtwstrfn.h"
 
 #ifdef __cplusplus

diff --git a/c_cpp_includes/dtwpdft.h b/c_cpp_includes/dtwpdft.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwstrfn.h b/c_cpp_includes/dtwstrfn.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/dtwtype.h b/c_cpp_includes/dtwtype.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/c_cpp_includes/winconst.h b/c_cpp_includes/winconst.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/capconst.h b/demos/c_cpp_includes/capconst.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwain.h b/demos/c_cpp_includes/dtwain.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwain_filetypes.h b/demos/c_cpp_includes/dtwain_filetypes.h
@@ -1,6 +1,6 @@
 /*
 This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-Copyright (c) 2002-2023 Dynarithmic Software.
+Copyright (c) 2002-2024 Dynarithmic Software.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwain_library_selector.h b/demos/c_cpp_includes/dtwain_library_selector.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwain_standard_defs.h b/demos/c_cpp_includes/dtwain_standard_defs.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwain_version.h b/demos/c_cpp_includes/dtwain_version.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      2
+#define DTWAIN_PATCHLEVEL_VERSION      3
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)

diff --git a/demos/c_cpp_includes/dtwainc.h b/demos/c_cpp_includes/dtwainc.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwaindefs.h b/demos/c_cpp_includes/dtwaindefs.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwainx.h b/demos/c_cpp_includes/dtwainx.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -944,6 +944,10 @@ DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedFileTypes(VOID_PROTOTYPE);
 DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedMultiPageFileTypes(VOID_PROTOTYPE);
 DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedSinglePageFileTypes(VOID_PROTOTYPE);
 
+/* Customize doubling the page count if acquiring in duplex mode */
+DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetDoublePageCountOnDuplex(DTWAIN_SOURCE Source, DTWAIN_BOOL bDoubleCount);
+DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsDoublePageCountOnDuplex(DTWAIN_SOURCE Source);
+
 #include "dtwstrfn.h"
 
 #ifdef __cplusplus

diff --git a/demos/c_cpp_includes/dtwpdft.h b/demos/c_cpp_includes/dtwpdft.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwstrfn.h b/demos/c_cpp_includes/dtwstrfn.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/dtwtype.h b/demos/c_cpp_includes/dtwtype.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/demos/c_cpp_includes/winconst.h b/demos/c_cpp_includes/winconst.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the Dynarithmic TWAIN Library (DTWAIN).
-    Copyright (c) 2002-2023 Dynarithmic Software.
+    Copyright (c) 2002-2024 Dynarithmic Software.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/updates/updates.txt b/updates/updates.txt
@@ -1,5 +1,27 @@
 DTWAIN Version changes
 
+5.4.3
+
+- Updated page handling logic when scanning duplex pages.  
+
+The number of pages specified by the DTWAIN_Acquire...() family of functions will automatically be doubled
+when the following occurs:
+
+1) acquiring duplex pages 
+   (DTWAIN_EnableDuplex has been called to set the duplexer to TRUE, or the device's only method of acquiring 
+    images is duplex)
+
+and
+
+2) The TWAIN Source user-interface is disabled.
+
+For 2) if the user interface *is* enabled, there is no way for DTWAIN to know if the user selected or deselected the duplex
+option (if one exists), so the page count cannot be automatically doubled.  In this case, the driver is responsible for the 
+duplexing to work properly if the user desired to enable duplexing.
+
+- Updated the copyright notices on source files, DLL's, etc. to the year 2024.
+
+
 5.4.2
 
 - Upgraded following internal image, compression, and cryptography libraries: