Merge pull request #66 from dynarithmic/master-staging

Master staging
dynarithmic · Jun 19, 2023 · a8450f8 · a8450f8
2 parents bbef843 + c0fefce
commit a8450f8
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 21 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](http://www.dynarithmic.com/onlinehelp5/dtwain/index.html).
-* The current version is [**5.3.0.6** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
+* The current version is [**5.3.0.7** (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: deb4e884a7eb7401b8dab6358f79d1bf
-SHA1: c4330cba8fbdfc5a524817082ca700cc9770213c
-SHA256: 62b61721f0f2416eba0915455c7fed4ff00208ff03fbde8058655a136264539b
-SHA512: b0f5378dc08327d77b1dc0796d3dad344d32689bbea6f7003797e36009b7698ec8bcfcf6c26bd5035005d0d822565500d3338abbb950ea78638356d46f053dc9
+MD5: b8231202870ee538005f350efa7b2f2f
+SHA1: 221d8ea8f86967349116559e14b00a60d335bcb8
+SHA256: 18c342ba15da2df12d51782b165c5dec4339fbac5c32ab7fbf2019c332157f8e
+SHA512: cab1878130787f6d740127020a69b603fcd36621bc26cc61feb230bdbff19c621a8cf26c421eff53faa2963d77138e871247304832341b1496fc07b61f007f5f
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) = 7e3ccaaef20c2a53d7234b68dc933956
-SHA1 hash of "release_libraries.zip" (20 bytes) = 196804ae9fbc9dc03e33b49e7ca929083d5a99dc
-SHA256 hash of "release_libraries.zip" (32 bytes) = b3dadb59bc518b3f585d9730f0eaaa7368c02eb22b21aa4cb64e79967c8dd49d
+MD5 hash of "release_libraries.zip" (16 bytes) = a3928b64a947c8dac389932fbe248b17
+SHA1 hash of "release_libraries.zip" (20 bytes) = ef934071ae2c093c14e8b21351c94e48ba7e5d80
+SHA256 hash of "release_libraries.zip" (32 bytes) = b7ea3a1ad60e2202bed9f2aa171cc1001daca6caf147ee2a97ba56d4e08591e9
 
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: 7095703a3afb663b475b0341cd7e5e3e
-SHA1: 4f0352b542549750808a3e03931ec1fdf619a7af
-SHA256: 6014aeac35eea25c2511211343623f6989305fd521c08fcd7fef99c772cbed7d
-SHA512: adeee00fdb9906f4aa76740b788dd8f77f0544f8febd246d9e4bdaca2d1fa4e58716e00b3a34d8887c1975bfb3a2362c83683a58b67088296c0a601de10fd01a
+MD5: fae574a4e02c241023646a75a7c46b82
+SHA1: 3ec5e8677e96290b6282e12158140fc8e51e35d2
+SHA256: e706cbd226fdfa31fbd7fe7679904395fce68c4e1acbeba857583c18887ea587
+SHA512: 2153986cf00c38a6078985b95de4c1c3f5248189a2265e2797d5095570e66702186230bb96712cfb23a0271ab51dfa88266d9095bbda465b7b95ab0195a0b9fb
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) = c33ab58fbd9c67fdb71f61c3858ebb44
-SHA1 hash of "release_libraries.zip" (20 bytes) = 587c87863d4f9caf1683f88e346c0033d248e225
-SHA256 hash of "release_libraries.zip" (32 bytes) = 725699a65f72094105d52f053fc58a1ee6e39ccc3124abb9591c35d38577c603
+MD5 hash of "release_libraries.zip" (16 bytes) = 0dd5dc2330f831563d8f742af981334b
+SHA1 hash of "release_libraries.zip" (20 bytes) = ad1ba35edde40841884e1e28feade445f3b0ef02
+SHA256 hash of "release_libraries.zip" (32 bytes) = a3e26d191462107d12eb654c796ce1f42a0fb8b160441f1ee35fe82d3c5ccdbb
 
diff --git a/c_cpp_includes/dtwain_version.h b/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      6
+#define DTWAIN_PATCHLEVEL_VERSION      7
 
 #define DTWAIN_VERINFO_BASEVERSION          "5.3"
 #define DTWAIN_VERINFO_FILEVERSION          "5.3.0.0"
-#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "6"
+#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "7"
 
 #ifdef USE_DTWAIN_DEBUG_LIB
     #define DTWAIN_DEVELOP_SUFFIX "d"

diff --git a/c_cpp_includes/dtwaindefs.h b/c_cpp_includes/dtwaindefs.h
@@ -849,8 +849,9 @@
 #define DTWAIN_ERR_ARRAYTYPE_MISMATCH (-1053)
 #define DTWAIN_ERR_SOURCENAME_NOTINSTALLED (-1054)
 #define DTWAIN_ERR_NO_MEMFILE_XFER       (-1055)
+#define DTWAIN_ERR_AREA_ARRAY_TOO_SMALL  (-1056)
 
-#define DTWAIN_ERR_LAST_1       DTWAIN_ERR_DEMO_NOFILETYPE
+#define DTWAIN_ERR_LAST_1       DTWAIN_ERR_AREA_ARRAY_TOO_SMALL
 
 #define TWAIN_ERR_LOW_MEMORY        (-1100)
 #define TWAIN_ERR_FALSE_ALARM       (-1101)

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      6
+#define DTWAIN_PATCHLEVEL_VERSION      7
 
 #define DTWAIN_VERINFO_BASEVERSION          "5.3"
 #define DTWAIN_VERINFO_FILEVERSION          "5.3.0.0"
-#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "6"
+#define DTWAIN_VERINFO_PATCHLEVEL_VERSION   "7"
 
 #ifdef USE_DTWAIN_DEBUG_LIB
     #define DTWAIN_DEVELOP_SUFFIX "d"

diff --git a/demos/c_cpp_includes/dtwaindefs.h b/demos/c_cpp_includes/dtwaindefs.h
@@ -849,8 +849,9 @@
 #define DTWAIN_ERR_ARRAYTYPE_MISMATCH (-1053)
 #define DTWAIN_ERR_SOURCENAME_NOTINSTALLED (-1054)
 #define DTWAIN_ERR_NO_MEMFILE_XFER       (-1055)
+#define DTWAIN_ERR_AREA_ARRAY_TOO_SMALL  (-1056)
 
-#define DTWAIN_ERR_LAST_1       DTWAIN_ERR_DEMO_NOFILETYPE
+#define DTWAIN_ERR_LAST_1       DTWAIN_ERR_AREA_ARRAY_TOO_SMALL
 
 #define TWAIN_ERR_LOW_MEMORY        (-1100)
 #define TWAIN_ERR_FALSE_ALARM       (-1101)

diff --git a/text_resources/twainresourcestrings_dutch.txt b/text_resources/twainresourcestrings_dutch.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 Area array is te klein. Array moet ten minste 4 items bevatten
 1100 TWAIN Gesteldheid niet Code: niet voleindigde operaties.   Ontoerijkende Herinnering
 1101 TWAIN Gesteldheid Code: Vergissing
 1102 TWAIN Gesteldheid Code: Unknown oorzaak of mislukking

diff --git a/text_resources/twainresourcestrings_english.txt b/text_resources/twainresourcestrings_english.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 Area array is too small.  Array should have at least 4 items.
 1100 TWAIN Condition Code: Could not complete operation.  Insufficient Memory.
 1101 TWAIN Condition Code: No Error
 1102 TWAIN Condition Code: Unknown cause of failure

diff --git a/text_resources/twainresourcestrings_french.txt b/text_resources/twainresourcestrings_french.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 Area array est trop petit. Le tableau doit comporter au moins 4 �l�ments.
 1100 Condition de Twain ne pouvait pas Coder : ne pouvions pas parachever de l'op�ration.   M�moire Insuffisante.
 1101 Faute de Code : de Condition de Twain
 1102 Twain Conditionne Code : Inconnu de la cause du rat�

diff --git a/text_resources/twainresourcestrings_german.txt b/text_resources/twainresourcestrings_german.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 Das Bereichsarray ist zu klein. Das Array sollte mindestens 4 Elemente enthalten.
 1100 TWAIN Zustandscode: Zu wenig Speicher
 1101 TWAIN Zustandscode: Kein Fehler
 1102 TWAIN Zustandscode: Unbekannte Fehlerursache

diff --git a/text_resources/twainresourcestrings_italian.txt b/text_resources/twainresourcestrings_italian.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 Area array � troppo piccolo. La matrice deve contenere almeno 4 elementi.
 1100 TWAIN Condizione non Cifri: non finendo operazione.   Insufficiente Memoria.
 1101 TWAIN Condizione Codice: Errore
 1102 TWAIN Condiziona Codice: Unknown causa di fallimento

diff --git a/text_resources/twainresourcestrings_portuguese_br.txt b/text_resources/twainresourcestrings_portuguese_br.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Source does not support memory file transfers
+1056 A matriz de �rea � muito pequena. A matriz deve ter pelo menos 4 itens.
 1100 C�digo de Condi��o TWAIN: N�o foi poss�vel concluir a opera��o. Mem�ria insuficiente.
 1101 C�digo de Condi��o TWAIN: Sem Erros
 1102 C�digo de Condi��o TWAIN: Falha de causa desconhecida

diff --git a/text_resources/twainresourcestrings_spanish.txt b/text_resources/twainresourcestrings_spanish.txt
@@ -68,6 +68,7 @@
 1053 DTWAIN ARRAY not the same type
 1054 Source not installed
 1055 Procedencia no apoya archivo las transferencias (transferencia de memoria)
+1056 La matriz de �rea es demasiado peque�a. La matriz debe tener al menos 4 elementos.
 1100 Condici�n de TWAIN no podr�a Codificar a no podr�amos completar funcionamiento.   Memoria Insuficiente.
 1101 Error de C�digo de Condici�n de TWAIN
 1102 TWAIN Condiciona C�digo Unknown causa del fracaso

diff --git a/updates/updates.txt b/updates/updates.txt
@@ -1,5 +1,11 @@
 DTWAIN Version changes
 
+5.3.0.7 
+
+- Fix issue with DTWAIN_SetAcquireArea when resetting the acquisition area of interest.
+
+
+
 5.3.0.6 
 
 - Fix issue with DTWAIN_SelectDefaultSource selecting a null TWAIN data source.