Merge pull request #28 from dynarithmic/development

Development
dynarithmic · Jun 4, 2023 · 1189e46 · 1189e46
2 parents 20f9f21 + 5476954
commit 1189e46
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 27 deletions.
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: 2c46fd5c2f4d2114acc8063b0f34f5a9
-SHA1: d4de7fbde7a897609212a30c6a1c37e81fdc013b
-SHA256: 0f52cb0d7cc331f59bf9e562d4dfab65924c073f0608fdc9d5396fec86f68984
-SHA512: 13e8430963a91ea7e18416881424b7366516f3b90d0034e11d3867316e83951a050b43a125aa38a99c559501375bb355222876577e82a2baffb309041de8c5a5
+MD5: deb4e884a7eb7401b8dab6358f79d1bf
+SHA1: c4330cba8fbdfc5a524817082ca700cc9770213c
+SHA256: 62b61721f0f2416eba0915455c7fed4ff00208ff03fbde8058655a136264539b
+SHA512: b0f5378dc08327d77b1dc0796d3dad344d32689bbea6f7003797e36009b7698ec8bcfcf6c26bd5035005d0d822565500d3338abbb950ea78638356d46f053dc9
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) = 07d2a2da46fd196c47ba0cbbf1bddfef
-SHA1 hash of "release_libraries.zip" (20 bytes) = b659b22902ccddf1537b1380e32b24dfeb128e0e
-SHA256 hash of "release_libraries.zip" (32 bytes) = 4ec3495271d701af1f6be422e90ebf06fbdb119331bb0b52fb4e4ae57b738461
+MD5 hash of "release_libraries.zip" (16 bytes) = 7e3ccaaef20c2a53d7234b68dc933956
+SHA1 hash of "release_libraries.zip" (20 bytes) = 196804ae9fbc9dc03e33b49e7ca929083d5a99dc
+SHA256 hash of "release_libraries.zip" (32 bytes) = b3dadb59bc518b3f585d9730f0eaaa7368c02eb22b21aa4cb64e79967c8dd49d
 
diff --git a/binaries/32bit_debug/debug_libraries.zip b/binaries/32bit_debug/debug_libraries.zip
diff --git a/binaries/32bit_debug/debug_ziphashes32.txt b/binaries/32bit_debug/debug_ziphashes32.txt
@@ -1,4 +1,4 @@
-MD5 hash of "debug_libraries.zip" (16 bytes) = baf23357282fcbd96a7bd28b795bf137
-SHA1 hash of "debug_libraries.zip" (20 bytes) = 2c2b49b2bd73058d7ea506f371879e4267b1fcbe
-SHA256 hash of "debug_libraries.zip" (32 bytes) = 00cbe148ca13a1e321cc562fdfadab1c45db655ba07339239b69030721b62914
+MD5 hash of "debug_libraries.zip" (16 bytes) = fa59eb8a77e6df50015ed0199af07ea1
+SHA1 hash of "debug_libraries.zip" (20 bytes) = 137957d82e486554e39bda7e51ad7d19019fde23
+SHA256 hash of "debug_libraries.zip" (32 bytes) = 8d517882dba5a16a210d78af76bbb142234437296214528deb79367fdd4b6659
 
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: 765a965f62384293657926ba9a7d6180
-SHA1: 987e0f88dd45862feb236453e6ab717d3774a129
-SHA256: d9e0bed617b6afb83b47426462dd84a5cbf4204a4d1ae10390b9f5b107de00aa
-SHA512: bf9628456c2a880e13afedccec9160244d04ba4ea03f5313c656df32cb64ead983d89710f02eec82e417ddbef299d858ec163c77fc8fca9bfa40e6b750647727
+MD5: 7095703a3afb663b475b0341cd7e5e3e
+SHA1: 4f0352b542549750808a3e03931ec1fdf619a7af
+SHA256: 6014aeac35eea25c2511211343623f6989305fd521c08fcd7fef99c772cbed7d
+SHA512: adeee00fdb9906f4aa76740b788dd8f77f0544f8febd246d9e4bdaca2d1fa4e58716e00b3a34d8887c1975bfb3a2362c83683a58b67088296c0a601de10fd01a
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) = 88b4984b982276d3b95c4e5d16d6a54f
-SHA1 hash of "release_libraries.zip" (20 bytes) = 354b74b82cda80cdf9f7b33198bf6495f296d807
-SHA256 hash of "release_libraries.zip" (32 bytes) = d51858099822d37624c8bd3f8a06883da958d5e7acc36696178cdbd2523f9b28
+MD5 hash of "release_libraries.zip" (16 bytes) = c33ab58fbd9c67fdb71f61c3858ebb44
+SHA1 hash of "release_libraries.zip" (20 bytes) = 587c87863d4f9caf1683f88e346c0033d248e225
+SHA256 hash of "release_libraries.zip" (32 bytes) = 725699a65f72094105d52f053fc58a1ee6e39ccc3124abb9591c35d38577c603
 
diff --git a/demos/c_cpp_includes/dtwain_version.h b/demos/c_cpp_includes/dtwain_version.h
@@ -24,11 +24,11 @@
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           3
 #define DTWAIN_SUBMINOR_VERSION        0
-#define DTWAIN_PATCHLEVEL_VERSION      5
+#define DTWAIN_PATCHLEVEL_VERSION      6
 
 #define DTWAIN_VERINFO_BASEVERSION          "5.3"
 #define DTWAIN_VERINFO_FILEVERSION          "5.3.0.0"
-#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "5"
+#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "6"
 
 #ifdef USE_DTWAIN_DEBUG_LIB
     #define DTWAIN_DEVELOP_SUFFIX "d"

diff --git a/source/cpp/ctltwses.cpp b/source/cpp/ctltwses.cpp
@@ -183,14 +183,10 @@ bool CTL_ITwainSession::SelectSource( const CTL_ITwainSource* pSource )
 {
     if ( !pSource )  // Choose the default source
     {
-        // Get first source
+        // Get default source
         CTL_GetDefaultSourceTriplet ST( this );
         if ( ST.Execute() == TWRC_SUCCESS )
-        {
-            const CTL_ITwainSource* pSourceTemp = ST.GetSourceIDPtr();
-            m_pSelectedSource = IsSourceSelected( pSourceTemp->GetProductName().c_str() );
-            CTL_ITwainSource::Destroy( pSourceTemp );
-        }
+            m_pSelectedSource = ST.GetSourceIDPtr();
         else
             return false;
     }

diff --git a/source/h/dtwain_version.h b/source/h/dtwain_version.h
@@ -24,11 +24,11 @@
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           3
 #define DTWAIN_SUBMINOR_VERSION        0
-#define DTWAIN_PATCHLEVEL_VERSION      5
+#define DTWAIN_PATCHLEVEL_VERSION      6
 
 #define DTWAIN_VERINFO_BASEVERSION          "5.3"
 #define DTWAIN_VERINFO_FILEVERSION          "5.3.0.0"
-#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "5"
+#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "6"
 
 #ifdef USE_DTWAIN_DEBUG_LIB
     #define DTWAIN_DEVELOP_SUFFIX "d"

diff --git a/updates/updates.txt b/updates/updates.txt
@@ -1,5 +1,11 @@
 DTWAIN Version changes
 
+5.3.0.6 
+
+- Fix issue with DTWAIN_SelectDefaultSource selecting a null TWAIN data source.
+
+
+
 5.3.0.5 
 
 - Add DTWAIN_IsSourceValid() function to explicitly test to see if the DTWAIN_SOURCE is valid.