Skip to content

Commit

Permalink
Merge pull request #113 from dynarithmic/master-staging
Browse files Browse the repository at this point in the history
Update master to 5.5.0
  • Loading branch information
dynarithmic authored Sep 6, 2024
2 parents 56491ea + 7adeb7a commit 0751d81
Show file tree
Hide file tree
Showing 145 changed files with 21,224 additions and 17,448 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
* This repository contains the DTWAIN Library, **Version 5.x**, from Dynarithmic Software. DTWAIN is an open source programmer's library that will allow applications to acquire images from TWAIN-enabled devices using a simple Application Programmer's Interface (API).

* 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.8** (See Version History)](https://github.com/dynarithmic/twain_library/tree/master/updates/updates.txt).
* The DTWAIN Library online help file can be found [here](https://www.dynarithmic.com/onlinehelp/dtwain/newversion/Dynarithmic%20TWAIN%20Library,%20Version%205.x.html), and in .CHM (Windows Help) format [here](https://github.com/dynarithmic/twain_library-helpdocs/tree/main/windows).

The .CHM file and online-help are being updated to version 5.5 on a constant basis. Updates will be made available in the [help repository](https://github.com/dynarithmic/twain_library-helpdocs/tree/main), as it may have information that pertains to the older commercial version of DTWAIN that will have to be updated or removed.
* The current version of DTWAIN is [**5.5.0** (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 added TwainSpecification/TWAIN-2.5-Features.pdf
Binary file not shown.
Binary file added TwainSpecification/TWAIN-2.5-Specification.pdf
Binary file not shown.
Binary file modified binaries/32bit/32bit_FullDemo.zip
Binary file not shown.
9 changes: 4 additions & 5 deletions binaries/32bit/32bit_FullDemo_hash.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
MD5: 896e4305ea73d8d3fef3b9b0464bc826
SHA1: 07f24e7f57fdd894794f8742daecb1cde34977d5
SHA256: 514d66b251a55e5616bfcc5e88f4b8aa0f0d36666601f0bd45ed10ae6b35f1cf
SHA512: 6b0c23a17a351dc7a80e98e85235c731bce7855a146f59e1b666da6e7cf9abca5255e2e4265ea0236db39d377829dbc9e6011cd71916f765ce8103ab30e84fbe

MD5: c7492710d8e611b296dfb9464a3a7987
SHA1: 83ee138e9aada824be83eddb6b506842aa2af003
SHA256: 510ecaf073538ae615d9024127222f0503922d24c4228ca8a7f6560a1e170446
SHA512: 5edfec5b710c1580ea24cd2b195f46d468486f4fa6f3aa3644a9ad715507a28135a984be6333b82eb7831e3577f88cc8b11cf17ddbc84be322d4bd6220693c47
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) = 7bfb784834940b5ea4072125b1c0cb0c
SHA1 hash of "release_libraries.zip" (20 bytes) = 6ccb3b498e630f70f9d15019addcc9d0785f2e2b
SHA256 hash of "release_libraries.zip" (32 bytes) = ce666114a3d4ee22c67f086965a56ab946c00bf3ef0a2f041f0d454a45d0824b
MD5 hash of "release_libraries.zip" (16 bytes) = 1849b721e4d94c12c7dc411e313e3807
SHA1 hash of "release_libraries.zip" (20 bytes) = ec58ea876a133d185f32004519344a848f571ecb
SHA256 hash of "release_libraries.zip" (32 bytes) = 86fea3254e10da7e408dcf7ee106cea38c17086e0e41af700c299007346431e9

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: b5bdfaaa86e710b150d7f9a0fc3c42b9
SHA1: 1acc69e7f2cad58aa152c017758fe1e67ebf6af7
SHA256: 5d7a1aa1fed9205dbbaedc9536b1b30e91a2aa41c29d7c36657ae629e99ccec0
SHA512: 6fef7b3e39283f1c47484f2ec50a6fdfb8f31b38993cde82a3792028792dab559c609026d56954d78e681ba1fb60dce246128093c35ab5bdabc09f866e6170e6
MD5: fa16094a0135ffe52902087c451bc69b
SHA1: b391d76246053343cc5b90a4d862bbddbe2e6d9a
SHA256: fa6f13997a4c6e5a4265735786abaf57151a24ced6489e89858034cd6f19298b
SHA512: d8572b85225a7692d1b0a2a4acf6a345cf63a2059ec8eb95d67b8aa93441dbdf95612453c73aa0a52100d1785e16070ff7c2a707a47ac2e6078351fa73a8506b
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) = 5d0f1bc4c4ee63bb25c0069bc74d0671
SHA1 hash of "release_libraries.zip" (20 bytes) = 72b22ccd6b60c293fecea1e04674ce883f33b52b
SHA256 hash of "release_libraries.zip" (32 bytes) = 717a13483f340eba39c6afd5dadd9c56635cc9a87166afeebae204553416773b
MD5 hash of "release_libraries.zip" (16 bytes) = 2c8ca3ff7e92290f5abe50080d3ae60c
SHA1 hash of "release_libraries.zip" (20 bytes) = 067c71c4e1fd48d3767939cbb130f2a89b9f4b32
SHA256 hash of "release_libraries.zip" (32 bytes) = cc19c886aa00d7ac4a3a641688264f573755574cc19502d2485015116fd8cc27

14 changes: 14 additions & 0 deletions c_cpp_includes/dtwain_filetypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,18 @@ if you want to acquire using DTWAIN's file mode */
#define DTWAIN_WBMP_RESIZED 11000 /* Wireless Bitmap (WBMP) format for bitmaps with height > 255 or width > 255 pixels */
#define DTWAIN_TGA_RLE 11001 /* Targa with Run Length Encoding */
#define DTWAIN_BMP_RLE 11002 /* BMP with Run Length Encoding */
#define DTWAIN_BIGTIFFLZW 11003 /* BigTIFF with LZW compression */
#define DTWAIN_BIGTIFFLZWMULTI 11004 /* BigTIFF with LZW compression, multipage */
#define DTWAIN_BIGTIFFNONE 11005 /* BigTIFF with no compression */
#define DTWAIN_BIGTIFFNONEMULTI 11006 /* BigTIFF with no compression, multipage */
#define DTWAIN_BIGTIFFPACKBITS 11007 /* BigTIFF with Packbits compression */
#define DTWAIN_BIGTIFFPACKBITSMULTI 11008 /* BigTIFF with Packbits compression, multipage */
#define DTWAIN_BIGTIFFDEFLATE 11009 /* BigTIFF packed with z-lib encoded data */
#define DTWAIN_BIGTIFFDEFLATEMULTI 11010 /* BigTIFF packed with z-lib encoded data (multipage) */
#define DTWAIN_BIGTIFFG3 11011 /* BigTIFF Group 3 CCITT Tiff (FAX format) */
#define DTWAIN_BIGTIFFG3MULTI 11012 /* BigTIFF Group 3 CCITT Tiff (FAX format) (multipage) */
#define DTWAIN_BIGTIFFG4 11013 /* BigTIFF Group 4 CCITT Tiff (FAX format) */
#define DTWAIN_BIGTIFFG4MULTI 11014 /* BigTIFF Group 4 CCITT Tiff (FAX format) (multipage) */
#define DTWAIN_BIGTIFFJPEG 11015 /* BigTIFF JPEG */
#define DTWAIN_BIGTIFFJPEGMULTI 11016 /* BigTIFF JPEG (Multipage) */
#endif
19 changes: 14 additions & 5 deletions c_cpp_includes/dtwain_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#define DTWAIN_VERSION_H

#define DTWAIN_MAJOR_VERSION 5
#define DTWAIN_MINOR_VERSION 4
#define DTWAIN_PATCHLEVEL_VERSION 8
#define DTWAIN_MINOR_VERSION 5
#define DTWAIN_PATCHLEVEL_VERSION 0

#define DTWAIN_TEXTRESOURCE_MIN_MAJOR_VERSION 5
#define DTWAIN_TEXTRESOURCE_MIN_MINOR_VERSION 4
#define DTWAIN_TEXTRESOURCE_MIN_PATCHLEVEL_VERSION 5
#define DTWAIN_TEXTRESOURCE_MIN_MINOR_VERSION 5
#define DTWAIN_TEXTRESOURCE_MIN_PATCHLEVEL_VERSION 0

#define DTWAIN_STRINGER_2_(x) #x
#define DTWAIN_STRINGER_(x) DTWAIN_STRINGER_2_(x)
Expand All @@ -40,8 +40,17 @@
#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)

#define DTWAIN_BUILDVERSION_TOP 0
#define DTWAIN_BUILDVERSION_MIDDLE 0
#define DTWAIN_BUILDVERSION_BOTTOM 3
#define DTWAIN_BUILDVERSION DTWAIN_STRINGER_(DTWAIN_BUILDVERSION_TOP) DTWAIN_STRINGER_(DTWAIN_BUILDVERSION_MIDDLE) DTWAIN_STRINGER_(DTWAIN_BUILDVERSION_BOTTOM)

#ifdef _MSC_VER
#pragma message ( "Compiling with DTWAIN Version " DTWAIN_VERINFO_FILEVERSION)
#ifdef BUILDING_DTWAINDLL
#pragma message ( "Building DTWAIN Version " DTWAIN_VERINFO_FILEVERSION " Build " DTWAIN_BUILDVERSION)
#else
#pragma message ( "Compiling using DTWAIN Version " DTWAIN_VERINFO_FILEVERSION " Build " DTWAIN_BUILDVERSION)
#endif
#endif

#ifdef USE_DTWAIN_DEBUG_LIB
Expand Down
25 changes: 18 additions & 7 deletions c_cpp_includes/dtwaindefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,11 @@
#define DTWAIN_TN_ACQUIREPAGEDONE 1010

/* Source closing/opening wParam's */
#define DTWAIN_TN_UICLOSING 1011
#define DTWAIN_TN_UICLOSED 1012
#define DTWAIN_TN_UIOPENED 1013
#define DTWAIN_TN_UIOPENING 1055
#define DTWAIN_TN_UIOPENFAILURE 1060
#define DTWAIN_TN_UICLOSING 3000
#define DTWAIN_TN_UICLOSED 3001
#define DTWAIN_TN_UIOPENED 3002
#define DTWAIN_TN_UIOPENING 3003
#define DTWAIN_TN_UIOPENFAILURE 3004

/* Twain page transferrance wParam's */
#define DTWAIN_TN_CLIPTRANSFERDONE 1014
Expand Down Expand Up @@ -379,7 +379,7 @@

/* Sent if user cancels the saving of a file using the file prompt */
#define DTWAIN_TN_FILESAVECANCELLED 1031
#define DTWAIN_TN_FILESAVECANCELED 1031
#define DTWAIN_TN_FILESAVECANCELED 1031
#define DTWAIN_TN_FILESAVEOK 1032
#define DTWAIN_TN_FILESAVEERROR 1033
#define DTWAIN_TN_FILEPAGESAVEOK 1034
Expand Down Expand Up @@ -850,8 +850,10 @@
#define DTWAIN_ERR_SOURCENAME_NOTINSTALLED (-1054)
#define DTWAIN_ERR_NO_MEMFILE_XFER (-1055)
#define DTWAIN_ERR_AREA_ARRAY_TOO_SMALL (-1056)
#define DTWAIN_ERR_LOG_CREATE_ERROR (-1057)
#define DTWAIN_ERR_FILESYSTEM_NOT_SUPPORTED (-1058)

#define DTWAIN_ERR_LAST_1 DTWAIN_ERR_AREA_ARRAY_TOO_SMALL
#define DTWAIN_ERR_LAST_1 DTWAIN_ERR_FILESYSTEM_NOT_SUPPORTED

#define TWAIN_ERR_LOW_MEMORY (-1100)
#define TWAIN_ERR_FALSE_ALARM (-1101)
Expand Down Expand Up @@ -989,6 +991,8 @@
#define DTWAIN_ERR_OCR_INVALIDBITDEPTH (-2106)
#define DTWAIN_ERR_OCR_RECOGNITIONERROR (-2107)
#define DTWAIN_ERR_OCR_LAST (-2108)

/* Extra TWAIN Source errors */
#define DTWAIN_ERR_SOURCE_COULD_NOT_OPEN (-2500)
#define DTWAIN_ERR_SOURCE_COULD_NOT_CLOSE (-2501)

Expand Down Expand Up @@ -1226,12 +1230,19 @@ DTWAIN DLL are not displayed */
/* DTWAIN Log to window (not yet implemented) */
#define DTWAIN_LOG_USEWINDOW 0x02000000

/* Create directory if logging to file */
#define DTWAIN_LOG_CREATEDIRECTORY 0x04000000

/* log everything, including displaying exceptions */
#define DTWAIN_LOG_ALL_NOCALLBACK (DTWAIN_LOG_ALL &~ (DTWAIN_LOG_USECALLBACK))

/* log everything using new log file */
#define DTWAIN_LOG_ALL_FILEAPPEND (DTWAIN_LOG_FILEAPPEND | DTWAIN_LOG_ALL)

/* log everything to a file and create directory */
#define DTWAIN_LOG_ALL_FILEAPPEND_CREATEDIRECTORY (DTWAIN_LOG_FILEAPPEND | DTWAIN_LOG_ALL | DTWAIN_LOG_CREATEDIRECTORY)
#define DTWAIN_LOG_ALL_FILE_CREATEDIRECTORY (DTWAIN_LOG_FILE | DTWAIN_LOG_ALL | DTWAIN_LOG_CREATEDIRECTORY)

/* turn off the DTWAIN_IsTwainMsg logging */
#define DTWAIN_LOG_NOISTWAINMSG(x) { if ((x) | DTWAIN_LOG_ISTWAINMSG) (x) &= ~DTWAIN_LOG_ISTWAINMSG; }
#define DTWAIN_LOG_NOLOWLEVELTWAIN(x) { (x) &= ~(DTWAIN_LOG_LOWLEVELTWAIN); }
Expand Down
6 changes: 4 additions & 2 deletions c_cpp_includes/dtwainx.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsTwainAvailable(VOID_PROTOTYPE);
DTWAIN_HANDLE DLLENTRY_DEF DTWAIN_SysInitialize(VOID_PROTOTYPE);

/* Initialize DTWAIN without having the "Resources not found" error box blocking the client */
DTWAIN_HANDLE DLLENTRY_DEF DTWAIN_SysInitializeNoBlocking(VOID_PROTOTYPE);
DTWAIN_HANDLE DLLENTRY_DEF DTWAIN_SysInitializeNoBlocking();

/* Uninitialize DTWAIN (closes all open sources, shuts down the link to the TWAIN DSM) */
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SysDestroy(VOID_PROTOTYPE);
Expand Down Expand Up @@ -123,6 +123,7 @@ DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumSupportedCapsEx2(DTWAIN_SOURCE Sourc
DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumExtendedCapsEx2(DTWAIN_SOURCE Source);
DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_EnumCustomCapsEx2(DTWAIN_SOURCE Source);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsCapSupported(DTWAIN_SOURCE Source,LONG lCapability );
DTWAIN_ARRAY DLLENTRY_DEF DTWAIN_TestGetCap(DTWAIN_SOURCE Source, LONG lCapability);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetCapOperations(DTWAIN_SOURCE Source,LONG lCapability,LPLONG lpOps);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetAllCapsToDefault(DTWAIN_SOURCE Source);
LONG DLLENTRY_DEF DTWAIN_GetCapArrayType(DTWAIN_SOURCE Source, LONG nCap);
Expand Down Expand Up @@ -386,7 +387,6 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsAutoFeedEnabled(DTWAIN_SOURCE Source)
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsAutoFeedSupported(DTWAIN_SOURCE Source);
LONG DLLENTRY_DEF DTWAIN_GetFeederFuncs(DTWAIN_SOURCE Source);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsPaperDetectable(DTWAIN_SOURCE Source);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnableAutoFeedNotify(LONG Latency, DTWAIN_BOOL bEnable);

/* Duplex Scanner support */
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetDuplexType(DTWAIN_SOURCE Source, LPLONG lpDupType);
Expand Down Expand Up @@ -601,6 +601,8 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_IsFileSystemSupported( DTWAIN_SOURCE Source );
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnumTopCameras(DTWAIN_SOURCE Source, LPDTWAIN_ARRAY Cameras);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnumBottomCameras(DTWAIN_SOURCE Source, LPDTWAIN_ARRAY Cameras);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnumCameras(DTWAIN_SOURCE Source, LPDTWAIN_ARRAY Cameras);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_EnumCamerasEx(DTWAIN_SOURCE Source, LONG nWhichCamera, LPDTWAIN_ARRAY Cameras);


/* Blank page detection functions */
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetBlankPageDetection(DTWAIN_SOURCE Source, DTWAIN_FLOAT threshold,
Expand Down
10 changes: 8 additions & 2 deletions c_cpp_includes/dtwstrfn.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ LONG DLLENTRY_DEF DTWAIN_GetSourceProductNameA(DTWAIN_SOURCE Source, LPSTR szPro
LONG DLLENTRY_DEF DTWAIN_GetSourceProductNameW(DTWAIN_SOURCE Source, LPWSTR szProduct, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetSourceVersionInfoA(DTWAIN_SOURCE Source, LPSTR szProduct, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetSourceVersionInfoW(DTWAIN_SOURCE Source, LPWSTR szProduct, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetTwainAvailabilityExA(LPSTR szDirectories, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetTwainAvailabilityExW(LPWSTR szDirectories, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetTempFileDirectoryA(LPSTR szFilePath, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetTempFileDirectoryW(LPWSTR szFilePath, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetVersionInfoA(LPSTR lpszVer, LONG nLength);
Expand Down Expand Up @@ -297,6 +299,8 @@ LONG DLLENTRY_DEF DTWAIN_GetSourceDetailsA(LPCSTR szSources, LPSTR szBuf,
LONG DLLENTRY_DEF DTWAIN_GetSourceDetailsW(LPCWSTR szSources, LPWSTR szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
LONG DLLENTRY_DEF DTWAIN_GetVersionCopyrightA(LPSTR lpszApp, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetVersionCopyrightW(LPWSTR lpszApp, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_IsTwainAvailableExA(LPSTR directories, LONG nMaxLen);
LONG DLLENTRY_DEF DTWAIN_IsTwainAvailableExW(LPWSTR directories, LONG nMaxLen);

#ifdef DTWAIN_ANSIDLL
#define DTWAIN_CHARPTRTYPE LPSTR
Expand Down Expand Up @@ -407,6 +411,7 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetDeviceTimeDate( DTWAIN_SOURCE Source, DTWAIN_
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetDeviceTimeDate( DTWAIN_SOURCE Source, DTWAIN_CCHARPTRTYPE szTimeDate );
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetTimeDate( DTWAIN_SOURCE Source, DTWAIN_CHARPTRTYPE szTimeDate );
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_InitImageFileAppend(DTWAIN_CCHARPTRTYPE szFile, LONG fType);
LONG DLLENTRY_DEF DTWAIN_IsTwainAvailableEx(DTWAIN_CHARPTRTYPE directories, LONG nMaxLen);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_AddFileToAppend(DTWAIN_CCHARPTRTYPE szFile);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_LogMessage(DTWAIN_CCHARPTRTYPE message);
LONG DLLENTRY_DEF DTWAIN_GetOCRVersionInfo(DTWAIN_OCRENGINE Engine, DTWAIN_CHARPTRTYPE buffer,LONG maxBufSize);
Expand All @@ -416,7 +421,7 @@ LONG DLLENTRY_DEF DTWAIN_GetOCRManufacturer(DTWAIN_OCRENGINE Engine,DTWAIN_CHA
DTWAIN_OCRENGINE DLLENTRY_DEF DTWAIN_SelectOCREngineByName(DTWAIN_CCHARPTRTYPE lpszName);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_ExecuteOCR(DTWAIN_OCRENGINE Engine,DTWAIN_CCHARPTRTYPE szFileName,LONG nStartPage,LONG nEndPage);
HANDLE DLLENTRY_DEF DTWAIN_GetOCRText(DTWAIN_OCRENGINE Engine,LONG nPageNo,DTWAIN_CHARPTRTYPE Data,LONG dSize,LPLONG pActualSize,LONG nFlags);
LONG DLLENTRY_DEF DTWAIN_GetDSMFullName(LONG DSMType, LPTSTR szDLLName, LONG nMaxLen, LPLONG pWhichSearch);
LONG DLLENTRY_DEF DTWAIN_GetDSMFullName(LONG DSMType, DTWAIN_CHARPTRTYPE szDLLName, LONG nMaxLen, LPLONG pWhichSearch);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetAcquireArea2String(DTWAIN_SOURCE Source, DTWAIN_CHARPTRTYPE left, DTWAIN_CHARPTRTYPE top, DTWAIN_CHARPTRTYPE right, DTWAIN_CHARPTRTYPE bottom, LPLONG Unit);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetBrightnessString(DTWAIN_SOURCE Source, DTWAIN_CHARPTRTYPE Brightness);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_GetContrastString(DTWAIN_SOURCE Source, DTWAIN_CHARPTRTYPE Contrast);
Expand Down Expand Up @@ -464,7 +469,7 @@ DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetDoubleFeedDetectLengthString(DTWAIN_SOURCE So
LONG DLLENTRY_DEF DTWAIN_GetTwainCountryValue(DTWAIN_CCHARPTRTYPE country);
BOOL DLLENTRY_DEF DTWAIN_GetTwainLanguageName(LONG nameId, DTWAIN_CHARPTRTYPE szName);
LONG DLLENTRY_DEF DTWAIN_GetTwainLanguageValue(DTWAIN_CCHARPTRTYPE szName);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_AcquireAudioFile(DTWAIN_SOURCE Source, DTWAIN_CCHARPTRTYPE lpszFile, LONG lFileFlags, LONG lMaxClips, DTWAIN_BOOL bShowUI, DTWAIN_BOOL bCloseSource,LPLONG pStatus);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_AcquireAudioFile(DTWAIN_SOURCE Source, DTWAIN_CCHARPTRTYPE lpszFile, LONG lFileFlags, LONG lMaxClips, DTWAIN_BOOL bShowUI, DTWAIN_BOOL bCloseSource,LPLONG pStatus);
LONG DLLENTRY_DEF DTWAIN_GetOCRErrorString(DTWAIN_OCRENGINE Engine, LONG lError, DTWAIN_CHARPTRTYPE lpszBuffer, LONG nMaxLen);
DTWAIN_BOOL DLLENTRY_DEF DTWAIN_SetPDFTextElementString(DTWAIN_PDFTEXTELEMENT TextElement, DTWAIN_CCHARPTRTYPE val1, LONG Flags);
LONG DLLENTRY_DEF DTWAIN_GetFileTypeName(LONG nType, DTWAIN_CHARPTRTYPE lpszName, LONG nLength);
Expand All @@ -476,4 +481,5 @@ LONG DLLENTRY_DEF DTWAIN_GetWindowsVersionInfo(DTWAIN_CHARPTRTYPE lpszBuf
LONG DLLENTRY_DEF DTWAIN_GetSessionDetails(DTWAIN_CHARPTRTYPE szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
LONG DLLENTRY_DEF DTWAIN_GetSourceDetails(DTWAIN_CCHARPTRTYPE szSources, DTWAIN_CHARPTRTYPE szBuf, LONG nSize, LONG indentFactor, BOOL bRefresh);
LONG DLLENTRY_DEF DTWAIN_GetVersionCopyright(DTWAIN_CHARPTRTYPE lpszApp, LONG nLength);
LONG DLLENTRY_DEF DTWAIN_GetTwainAvailabilityEx(DTWAIN_CHARPTRTYPE directories, LONG nMaxLen);
#endif
14 changes: 13 additions & 1 deletion c_cpp_includes/winconst.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
#endif
#endif

#ifdef _MSC_VER
#ifdef BUILDING_DTWAINDLL
#if _MSC_VER < 1920
#error("Visual C++ compiler must be Visual Studio 2019 or greater to build DTWAIN")
#endif
#if (__cplusplus < 201703L)
#error("Visual C++ Compiler must use C++17 standard or greaater to build DTWAIN")
#endif
#endif
#endif


#ifdef _MSC_VER
#if defined (UNICODE) || defined (_UNICODE)
#pragma message ("DTWAIN Library using Unicode is active")
Expand Down Expand Up @@ -116,7 +128,7 @@
#if defined(WIN64) || defined (_WIN64)
#pragma message("Building 64-bit DTWAIN DLL")
#else
#pragma message("Building 32-bit DTWAIN DLL, OCX or VB version")
#pragma message("Building 32-bit DTWAIN DLL")
#endif
#endif
#else
Expand Down
Loading

0 comments on commit 0751d81

Please sign in to comment.