From e4507f0ed6e514a9fc0548fc28d2f90573dc3595 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Tue, 19 Jul 2022 09:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BC=96=E8=AF=91=E5=9F=BA?=
=?UTF-8?q?=E7=A1=80=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
device/scanner.rc | 8 ++++----
device/scanner.vcxproj | 20 ++++++++++++--------
sane/gb_json.cpp | 2 +-
sane/gb_json.h | 2 +-
sane/sane.rc | 8 ++++----
twain/brand.h | 6 +++---
twain/twain.vcxproj | 4 ++--
twain/twain/huagaods.cpp | 2 +-
8 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/device/scanner.rc b/device/scanner.rc
index 3ebb6f2..4658f0a 100644
--- a/device/scanner.rc
+++ b/device/scanner.rc
@@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1018,2022,7181
- PRODUCTVERSION 4,1018,2022,7181
+ FILEVERSION 4,1019,2022,7191
+ PRODUCTVERSION 4,1019,2022,7191
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
- VALUE "FileVersion", "4.1018.2022.7181"
+ VALUE "FileVersion", "4.1019.2022.7191"
VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1018.2022.7181"
+ VALUE "ProductVersion", "4.1019.2022.7191"
END
END
BLOCK "VarFileInfo"
diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index 0209fc2..542ac13 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -40,13 +40,13 @@
Unicode
- Application
+ DynamicLibrary
true
v142
Unicode
- Application
+ DynamicLibrary
false
v142
true
@@ -88,15 +88,15 @@
true
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
- $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)
+ $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)
false
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
- $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(IncludePath)
- $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(LibraryPath)
+ $(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)
+ $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)
@@ -161,14 +161,16 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
Level3
true
- _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
+ 4996;
Console
true
+ opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
@@ -184,8 +186,9 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
true
true
true
- NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
+ 4996;
Console
@@ -194,6 +197,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
true
+ opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
diff --git a/sane/gb_json.cpp b/sane/gb_json.cpp
index d22b0a4..0dfbae1 100644
--- a/sane/gb_json.cpp
+++ b/sane/gb_json.cpp
@@ -3,7 +3,7 @@
#include
#include
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN64)
#define bzero(b, s) memset(b, 0, s)
#endif
diff --git a/sane/gb_json.h b/sane/gb_json.h
index 886bd3e..cbec517 100644
--- a/sane/gb_json.h
+++ b/sane/gb_json.h
@@ -1,6 +1,6 @@
#pragma once
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN64)
#include
#endif
diff --git a/sane/sane.rc b/sane/sane.rc
index 5046d40..a9694d6 100644
--- a/sane/sane.rc
+++ b/sane/sane.rc
@@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1018,2022,7181
- PRODUCTVERSION 4,1018,2022,7181
+ FILEVERSION 4,1019,2022,7191
+ PRODUCTVERSION 4,1019,2022,7191
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
- VALUE "FileVersion", "4.1018.2022.7181"
+ VALUE "FileVersion", "4.1019.2022.7191"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1018.2022.7181"
+ VALUE "ProductVersion", "4.1019.2022.7191"
END
END
BLOCK "VarFileInfo"
diff --git a/twain/brand.h b/twain/brand.h
index e6c9ba1..f11b6a5 100644
--- a/twain/brand.h
+++ b/twain/brand.h
@@ -6,15 +6,15 @@
#define OEM_NONE
#define VERSION_MAIN 4
-#define VERSION_SUB 1018
+#define VERSION_SUB 1019
#define VERSION_BUILD 2022
-#define VERSION_PATCH 7181
+#define VERSION_PATCH 7191
#define TO_STR(a) #a
#define TO_VER_STR(vs) TO_STR(v##vs)
#define VERSION_STR(a, b, c, d) TO_VER_STR(a.b.c.d)
-#define PRODUCT_ID 100
+#define PRODUCT_ID 402
#define MAKE_PID(pid) 0x##pid
#define PASTE_DEF(a, b) a##b
#define FINAL_STR(a, b, c) TO_STR(a##b##c)
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index 9c2657e..86c1afc 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -49,7 +49,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain100.ds
+ huagaotwain402.ds
false
@@ -57,7 +57,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain100.ds
+ huagaotwain402.ds
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index 2340234..3c34a20 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -10,7 +10,7 @@
//#include "twpp/twglue.hpp"
#include
#include