Skip to content

Commit

Permalink
Merge pull request #96 from dynarithmic/master-staging
Browse files Browse the repository at this point in the history
Update DTWAIN to version 5.4.4
  • Loading branch information
dynarithmic authored May 14, 2024
2 parents dcaf6df + a8f7760 commit 665a243
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
* The current version is [**5.4.4** (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)**.

Expand Down
Binary file modified binaries/32bit/32bit_FullDemo.zip
Binary file not shown.
8 changes: 4 additions & 4 deletions binaries/32bit/32bit_FullDemo_hash.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MD5: eafe6b8c88d63fa722b94f79aa9a0a0c
SHA1: 77ef3ee803553fdab84ab32ceedc813b7a541b2f
SHA256: fc8f050d5ce858340ecfd88b705e15315bddeab0569fa763ed2720519d875711
SHA512: c074680346f2596da7935004a4f5b36be1d2a74a7d3ce466bfdc0ef7986af9eb10067ed0f7914eaca4200c4647fc44195cbe2441b50761f0498ea0b004177853
MD5: 6f9345c134c25aba4a93de2ca3c936a8
SHA1: 40d0be5198aef8268a5a83781caf1bebd2035f0d
SHA256: f1558abb5ff4f6a68bdfdca08f9116436329b3f2bcac0c3bee4f7116c00298d1
SHA512: 75e4ea2f4a58aba7f980c7d5537c26bfd14fafcfa14ff719222afed193aeab772f89d15d1051a4990e940c02ede28d0a1ed19d91e56383e1d71dc12b7f774098
Binary file modified binaries/32bit/release_libraries.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions binaries/32bit/release_ziphashes32.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
MD5 hash of "release_libraries.zip" (16 bytes) = 8fbc5817632c9d085c920956416fb2e4
SHA1 hash of "release_libraries.zip" (20 bytes) = 0da276af29799322fcfb6f73aac19d136ee66758
SHA256 hash of "release_libraries.zip" (32 bytes) = dc98eeb2a341584ab0d1fe3b8a2a2137ffa65e7797531aaa49c39b71f4859e84

Binary file modified binaries/64bit/64bit_FullDemo.zip
Binary file not shown.
8 changes: 4 additions & 4 deletions binaries/64bit/64bit_FullDemo_hash.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MD5: 8652c4b21aafc08c32412ad1348e316b
SHA1: d0b6277734d824adb2a2717f14fe4bd9d3b1e94d
SHA256: 25d11efdb95323885b613cb94eb4b438a58a554efbdfcf04f913fd491c64ba38
SHA512: f179af7ed041151bc897f69587f0d9a05c916d3af2cadb7ec3ea5856d26333b4acafe850506cedf0f3dd506149a11f4b0d8d35a4c9db2039d4e3867f861e97d2
MD5: 221deb589878a95c59be36bc92b5705e
SHA1: f219ded7dbc994ab3ea82fbcc95732b19371eae9
SHA256: 3af3c09744b147d6139a7eb8ee87dc585adda0087eccbd7217c9dde2c2d11f15
SHA512: 3ebc6449c5fb4ee0ef131e94339669fbb2905b3b64f8fe56a8dcbb85d46efc47a52ad2f149f9f6587130a41025c53a89d96bc5f2817b71e38af5186da5a25c74
Binary file modified binaries/64bit/release_libraries.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions binaries/64bit/release_ziphashes64.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
MD5 hash of "release_libraries.zip" (16 bytes) = cfa7d815a0abc7942fdd2143a29c0e4a
SHA1 hash of "release_libraries.zip" (20 bytes) = fc3edba5fbb87d72ad70fdd16b0eae1c88022bd4
SHA256 hash of "release_libraries.zip" (32 bytes) = 9bdd37090bd8872aceb4ad21e97e652b916253fdf9e100914498859f57c89ee7

2 changes: 1 addition & 1 deletion c_cpp_includes/dtwain_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#define DTWAIN_MAJOR_VERSION 5
#define DTWAIN_MINOR_VERSION 4
#define DTWAIN_PATCHLEVEL_VERSION 3
#define DTWAIN_PATCHLEVEL_VERSION 4

#define DTWAIN_STRINGER_2_(x) #x
#define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)
Expand Down
4 changes: 2 additions & 2 deletions demos/cpp_wrapper_lib/twain_source.cpp
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -702,6 +702,6 @@ namespace dynarithmic
twain_source& twain_source::set_acquire_characteristics(const acquire_characteristics& ac) noexcept
{ *(m_pTwainSourceImpl->m_acquire_characteristics) = ac; return *this; }
bool twain_source::set_tiff_compress_type(tiffcompress_value::value_type compress_type)
{ return API_INSTANCE DTWAIN_SetCompressionType(m_theSource, static_cast<LONG>(compress_type), true); }
{ return API_INSTANCE DTWAIN_SetTIFFCompressType(m_theSource, static_cast<LONG>(compress_type)); }
}
}
5 changes: 5 additions & 0 deletions updates/updates.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
DTWAIN Version changes

5.4.4

- Fixed possible null pointer access when retrieving the default TWAIN Source.


5.4.3

- Updated page handling logic when scanning duplex pages.
Expand Down

0 comments on commit 665a243

Please sign in to comment.