Merge pull request #100 from dynarithmic/master-staging

Master staging
dynarithmic · Jul 18, 2024 · 0e1dda8 · 0e1dda8
2 parents c05c42e + 6887dd5
commit 0e1dda8
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 19 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.5** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
+* The current version is [**5.4.6** (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: 4c519126b2a116d12b22da32dba55690
-SHA1: 979f4e611d7f5b4303cde8d7f484976f82cb3112
-SHA256: 7d3d196b44191df68a4e607152e84eca062c96324917cf5c89534956147d3140
-SHA512: 5375122bfcf061678c56189b106ac1a4a746aebe8162c2cda88158fa1b14a32c9ac367c6d69cadade019b2ffa7753b3e03d41fc64850a638076e9097421e3fb3
+MD5: ebf326a6010fbf3731496a9eda97edfb
+SHA1: 7ba0f2ae361ee4e11a039cfe31ef18807283d841
+SHA256: 12bd56e961a6713782992eee3b4544e8dfb7bbe3e6d85f62ae33ed3463425441
+SHA512: 9957bbbba1e062f6a61de166ffbe999669537d68beca26c263451e9c0108979c144699007a6eda532451c8eb3bde2d51e52b8912c96031a043f914e36ab2fc8f
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) = 13f66eacb76545ed147f4fc5db69e7cc
-SHA1 hash of "release_libraries.zip" (20 bytes) = 733b010b0fb57f22756e110eb64e8f0961b35c2c
-SHA256 hash of "release_libraries.zip" (32 bytes) = 83a2dc36b4b6648e7bdb76e54cefcff12b40a098c0c3660cc48cd343d4b17a37
+MD5 hash of "release_libraries.zip" (16 bytes) = 46ceba7a40826c4708a106611119d332
+SHA1 hash of "release_libraries.zip" (20 bytes) = 15e70dfc43ef26541869a1871e4d098ae707fea5
+SHA256 hash of "release_libraries.zip" (32 bytes) = 4a23fa8cf396a4cf73f67516e6a0de34b0d606996b04b651a468266bfda89a79
 
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: 21c59030edb644885054a1aa025c5d49
-SHA1: 54a98a659b1d24f1983bd244bdbcf18a5687025c
-SHA256: a8010968596a332299463d5b42bffcb27756c1fda41198503df2b7fd29d1ff2b
-SHA512: 68a7891045839b698b15156dd91be04338b5c3142e544005bbba0765dd4b17e556b913f323e5fcd8510153bf94f3d85ea5548b8f0132891859e7ffb7c823dcc0
+MD5: 108a12a571b1506b978be5fe79a1a885
+SHA1: ab3b24f89ad778bfa2d30e456a709c1b7c0a66dc
+SHA256: 9b5e1c019dfd090e4003a146c367434a657745b8a589ab790ba93c4aca42703b
+SHA512: 0043d5d881ca9dac55eea5dcf072dcb7cabd9d1701bc6e13dc053e87da831f2312fbec87a13bb87b134f9ce586b80d80183c28ddecd12e08eead36bee13b7a9b
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) = 3b31f6a369035410e3025fda7b5dfc4d
-SHA1 hash of "release_libraries.zip" (20 bytes) = e75b88ed33755db073cfca8c7974dafd4477ff5f
-SHA256 hash of "release_libraries.zip" (32 bytes) = 7120c42c2bf727f356a2b6e04e68ab53580aa1f8b4c9f903627f2de1d467f926
+MD5 hash of "release_libraries.zip" (16 bytes) = 99f70861a82c602584cd1811ba241989
+SHA1 hash of "release_libraries.zip" (20 bytes) = 686c91d4d397ee33ea9f87bdc630536441aa2027
+SHA256 hash of "release_libraries.zip" (32 bytes) = f6892b52e883b9da9b731544027bb4df5e3dd46fd73dd80c26e741360fa71672
 
diff --git a/c_cpp_includes/dtwain_version.h b/c_cpp_includes/dtwain_version.h
@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      5
+#define DTWAIN_PATCHLEVEL_VERSION      6
 
 #define DTWAIN_TEXTRESOURCE_MIN_MAJOR_VERSION           5
 #define DTWAIN_TEXTRESOURCE_MIN_MINOR_VERSION           4

diff --git a/demos/c_cpp_includes/dtwain_version.h b/demos/c_cpp_includes/dtwain_version.h
@@ -23,7 +23,11 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      5
+#define DTWAIN_PATCHLEVEL_VERSION      6
+
+#define DTWAIN_TEXTRESOURCE_MIN_MAJOR_VERSION           5
+#define DTWAIN_TEXTRESOURCE_MIN_MINOR_VERSION           4
+#define DTWAIN_TEXTRESOURCE_MIN_PATCHLEVEL_VERSION      5
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)
@@ -32,6 +36,10 @@
 #define DTWAIN_VERINFO_FILEVERSION          DTWAIN_VERINFO_BASEVERSION "." DTWAIN_STRINGER_(DTWAIN_PATCHLEVEL_VERSION)
 #define DTWAIN_VERINFO_PATCHLEVEL_VERSION   DTWAIN_STRINGER_2_(DTWAIN_PATCHLEVEL_VERSION)
 
+#define DTWAIN_TEXTRESOURCE_BASEVERSION     DTWAIN_STRINGER_(DTWAIN_TEXTRESOURCE_MIN_MAJOR_VERSION) "." DTWAIN_STRINGER_(DTWAIN_TEXTRESOURCE_MIN_MINOR_VERSION)
+#define DTWAIN_TEXTRESOURCE_FILEVERSION     DTWAIN_TEXTRESOURCE_BASEVERSION "." DTWAIN_STRINGER_(DTWAIN_TEXTRESOURCE_MIN_PATCHLEVEL_VERSION)
+#define DTWAIN_TEXTRESOURCE_PATCHLEVEL_VERSION   DTWAIN_STRINGER_2_(DTWAIN_TEXTRESOURCE_MIN_PATCHLEVEL_VERSION)
+
 #ifdef _MSC_VER
 #pragma message ( "Compiling with DTWAIN Version " DTWAIN_VERINFO_FILEVERSION)
 #endif
@@ -69,6 +77,7 @@
 	#define DTWAIN_IMPORTLIBNAME DTWAIN_FILEDESCRIPTION ".lib"
     #define DTWAIN_ININAME DTWAIN_BASE_NAME_EX ".ini"
     #define DTWAIN_ININAME_NATIVE _T(DTWAIN_ININAME)
+    #define DTWAIN_TEXTRESOURCE_PATCHLEVEL_VERSION_NATIVE  _T(DTWAIN_TEXTRESOURCE_PATCHLEVEL_VERSION)
 #endif
 
 #ifndef _WIN32

diff --git a/demos/csharp/dtwain64u.cs b/demos/csharp/dtwain64u.cs
@@ -1630,7 +1630,7 @@ public class OpenFileName
         public const int DTWAIN_APIHANDLEOK    = 1;
         public const int DTWAIN_TWAINSESSIONOK = 2;
 
-`        public const string DTWAIN_LIBRARY = "dtwain64u.dll";
+        public const string DTWAIN_LIBRARY = "dtwain64u.dll";
 
 
         [DllImport(DTWAIN_LIBRARY, CharSet = CharSet.Auto,

diff --git a/language_bindings_and_examples/csharp/dtwain64u.cs b/language_bindings_and_examples/csharp/dtwain64u.cs
@@ -1630,7 +1630,7 @@ public class OpenFileName
         public const int DTWAIN_APIHANDLEOK    = 1;
         public const int DTWAIN_TWAINSESSIONOK = 2;
 
-`        public const string DTWAIN_LIBRARY = "dtwain64u.dll";
+        public const string DTWAIN_LIBRARY = "dtwain64u.dll";
 
 
         [DllImport(DTWAIN_LIBRARY, CharSet = CharSet.Auto,

diff --git a/updates/updates.txt b/updates/updates.txt
@@ -1,5 +1,12 @@
 DTWAIN Version changes
 
+5.4.6
+
+- Increase width of the label field in the TWAIN "Select Source" dialog when using DTWAIN_SelectSource2()
+
+- Fix typo in dtwain64u.cs file.
+
+
 5.4.5
 
 - Upgraded following internal image, compression, and cryptography libraries:
@@ -23,6 +30,8 @@ DTWAIN Version changes
 
 - Added entry to twaininfo.txt to properly handle text obtained from 1 bit-per-pixel OCR-ed images.
 
+- Added versioning check for twaininfo.txt.
+
 
 5.4.4