Merge pull request #80 from dynarithmic/master-staging

Update DTWAIN to 5.4.2

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.1** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
+* The current version is [**5.4.2** (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)**.
 

binaries/32bit/32bit_FullDemo_hash.txt

@@ -1,4 +1,4 @@
-MD5: 4ba228394a030b581180fdadb17fa305
-SHA1: 6300ca68f47e5098035ccd0cb6ad9d04f4d7b103
-SHA256: 1e2329080a53e88170b074020ade1c1b000d7a446758788ce79d3f8ab596a428
-SHA512: d182225e97a98b67f8c25667493a3c4eda1bf0d390f5e6b1c081c56a5040f78dd2547ed88c41c385afae8c2ebc87feed5f124b1ed41d8016add5ef9ef8426360
+MD5: 13f91f94248536a0a4b74c0000419483
+SHA1: b3a884cd67bf0d87e030b387a3289afe70c6d880
+SHA256: 71afe10b44f579e19cc863a9d5b38aeaad06dfb8a55974bf8f7e5161c4add5c1
+SHA512: 5d6e6bdf6874154cf8bc15a9df80a32e671fd48436dfda6e9c42a42c18fbc703ff83f5cf9e9492474f67cc4c95eb43bdebb4a1e00fd6d189d3d74c94fc72c446

binaries/32bit/release_ziphashes32.txt

@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = 39d8d5f7ed93e7eb0bd72225558e4c19
-SHA1 hash of "release_libraries.zip" (20 bytes) = 4702a0bfd643e0683ba7fac04f7476f8812ac64f
-SHA256 hash of "release_libraries.zip" (32 bytes) = 184538858562c71261b0b44a061e70e0947e51826de03a62173c08d014e93f7f
+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
 

binaries/64bit/64bit_FullDemo_hash.txt

@@ -1,4 +1,4 @@
-MD5: 33cf9cb3e747468db43f49c7d5da41c4
-SHA1: 683d3ad3b2c4c360ce1f479a109467c63171a76b
-SHA256: 1477c96cd644d8a0aaf662091fe385719cb6466e281e98f46e0a3eceadbe161e
-SHA512: 19b4588e948b1e59e9f9f7782253f0632c9bbb250d408dcc0c9ed12288bfd51a3053b31b655f7a271b2d8ba2fa0332c1c238b44142d0f3a4b5f573548998bc50
+MD5: 39d9689d424ccacf590adec5a035ac23
+SHA1: 56143dcc736d1b94cf21d7d9bb0c8d066c974eff
+SHA256: 184591ef544caa5704843b6fcfe2933165fb143f294904a0fa293a31f9d504b1
+SHA512: 99d903f652aa41f4752ea9cf2c3d3003ee9fcb3cc711c7aa0e0a360d0690f10ae58cf222fab17c1c653fbb856b76c1dafb7b7713bb7aa8bcb059d2837f17c2c9

binaries/64bit/release_ziphashes64.txt

@@ -1,4 +1,4 @@
-MD5 hash of "release_libraries.zip" (16 bytes) = 3763899a7cea3279ac417ca009a03833
-SHA1 hash of "release_libraries.zip" (20 bytes) = 57f41a80f4e85b836c5bea203bac9dd9722dc4d1
-SHA256 hash of "release_libraries.zip" (32 bytes) = dbee22d1123609836a2a2b9660555f720fe6c7df5d83ddf1aa542d7f97735e06
+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
 

c_cpp_includes/dtwain_version.h

@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      1
+#define DTWAIN_PATCHLEVEL_VERSION      2
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)
@@ -43,13 +43,13 @@
 #endif
 
 #ifdef _WIN32
-    #ifdef UNICODE
-        #define UNICODE_VERSION "(Unicode)"
-        #define UNICODE_SUFFIX  "u"
-    #else
-        #define UNICODE_VERSION
-        #define UNICODE_SUFFIX ""
-    #endif
+	#ifdef UNICODE
+		#define UNICODE_VERSION "(Unicode)"
+		#define UNICODE_SUFFIX  "u"
+	#else
+		#define UNICODE_VERSION
+		#define UNICODE_SUFFIX ""
+	#endif
 
     #ifdef DTWAIN_LEAN_AND_MEAN
         #define DTWAIN_LM_VERSION "_lm"
@@ -58,15 +58,15 @@
     #endif
 
     #define DTWAIN_BASE_NAME "dtwain"
-    #if defined (WIN64) || (_WIN64)
-        #define DTWAIN_OSPLATFORM "64"
-    #else
-        #define DTWAIN_OSPLATFORM "32"
-    #endif
+	#if defined (WIN64) || (_WIN64)
+		#define DTWAIN_OSPLATFORM "64"
+	#else
+		#define DTWAIN_OSPLATFORM "32"
+	#endif
     #define DTWAIN_BASE_NAME_EX DTWAIN_BASE_NAME DTWAIN_OSPLATFORM
     #define DTWAIN_FILEDESCRIPTION DTWAIN_BASE_NAME_EX UNICODE_SUFFIX DTWAIN_DEVELOP_SUFFIX DTWAIN_LM_VERSION
-    #define DTWAIN_DLLNAME      DTWAIN_FILEDESCRIPTION ".dll"
-    #define DTWAIN_IMPORTLIBNAME DTWAIN_FILEDESCRIPTION ".lib"
+	#define DTWAIN_DLLNAME      DTWAIN_FILEDESCRIPTION ".dll"
+	#define DTWAIN_IMPORTLIBNAME DTWAIN_FILEDESCRIPTION ".lib"
     #define DTWAIN_ININAME DTWAIN_BASE_NAME_EX ".ini"
     #define DTWAIN_ININAME_NATIVE _T(DTWAIN_ININAME)
 #endif

demos/c_cpp_includes/dtwain_version.h

@@ -23,7 +23,7 @@
 
 #define DTWAIN_MAJOR_VERSION           5
 #define DTWAIN_MINOR_VERSION           4
-#define DTWAIN_PATCHLEVEL_VERSION      1
+#define DTWAIN_PATCHLEVEL_VERSION      2
 
 #define DTWAIN_STRINGER_2_(x) #x
 #define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)
@@ -43,13 +43,13 @@
 #endif
 
 #ifdef _WIN32
-    #ifdef UNICODE
-        #define UNICODE_VERSION "(Unicode)"
-        #define UNICODE_SUFFIX  "u"
-    #else
-        #define UNICODE_VERSION
-        #define UNICODE_SUFFIX ""
-    #endif
+	#ifdef UNICODE
+		#define UNICODE_VERSION "(Unicode)"
+		#define UNICODE_SUFFIX  "u"
+	#else
+		#define UNICODE_VERSION
+		#define UNICODE_SUFFIX ""
+	#endif
 
     #ifdef DTWAIN_LEAN_AND_MEAN
         #define DTWAIN_LM_VERSION "_lm"
@@ -58,15 +58,15 @@
     #endif
 
     #define DTWAIN_BASE_NAME "dtwain"
-    #if defined (WIN64) || (_WIN64)
-        #define DTWAIN_OSPLATFORM "64"
-    #else
-        #define DTWAIN_OSPLATFORM "32"
-    #endif
+	#if defined (WIN64) || (_WIN64)
+		#define DTWAIN_OSPLATFORM "64"
+	#else
+		#define DTWAIN_OSPLATFORM "32"
+	#endif
     #define DTWAIN_BASE_NAME_EX DTWAIN_BASE_NAME DTWAIN_OSPLATFORM
     #define DTWAIN_FILEDESCRIPTION DTWAIN_BASE_NAME_EX UNICODE_SUFFIX DTWAIN_DEVELOP_SUFFIX DTWAIN_LM_VERSION
-    #define DTWAIN_DLLNAME      DTWAIN_FILEDESCRIPTION ".dll"
-    #define DTWAIN_IMPORTLIBNAME DTWAIN_FILEDESCRIPTION ".lib"
+	#define DTWAIN_DLLNAME      DTWAIN_FILEDESCRIPTION ".dll"
+	#define DTWAIN_IMPORTLIBNAME DTWAIN_FILEDESCRIPTION ".lib"
     #define DTWAIN_ININAME DTWAIN_BASE_NAME_EX ".ini"
     #define DTWAIN_ININAME_NATIVE _T(DTWAIN_ININAME)
 #endif

demos/cpp_wrapper/PDFDemo/PDFDemo.cpp

@@ -59,7 +59,7 @@ int Runner::Run()
 
             // Set the file transfer options
             fileOptions.
-                set_name("c:\\dtwain_ctest\\PDFDemo.pdf").  // File name
+                set_name("PDFDemo.pdf").  // File name
                 set_type(filetype_value::pdf);  // set the file type to PDF
 
             // Start the acquisition process

updates/updates.txt

@@ -1,5 +1,19 @@
 DTWAIN Version changes
 
+5.4.2
+
+- Upgraded following internal image, compression, and cryptography libraries:
+
+      crypto++ --> 8.9
+      libtiff  --> 4.6
+      libpng   --> 1.6.39
+      libjpg (IJG) --> 9e
+      libwebp  --> 1.3.2
+      openjpeg --> 2.5.0
+      zlib     --> 1.3.0.1
+
+- Dynarithmic Software version information is now embedded in generated JPEG-2000 image files.
+
 5.4.1
 
 - Address issue with DTWAIN_SetTwainLog() and resetting the logging options to "no logging" if