lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fatch conflict

This commit is contained in:
13038267101 2023-03-10 17:44:43 +08:00
parent 4b9694e8e8
commit 620bb87ae7
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
device/scanner.rc
View File

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,34,10000,22310 FILEVERSION 4,40,17100,23069
PRODUCTVERSION 4,34,10000,22310 PRODUCTVERSION 4,40,17100,23069
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司" VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序" VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.34.10000.22310" VALUE "FileVersion", "4.40.17100.23069"
VALUE "InternalName", "scanner.dll" VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022" VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2023"
VALUE "OriginalFilename", "scanner.dll" VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan" VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.34.10000.22310" VALUE "ProductVersion", "4.40.17100.23069"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

40
sane/sane.def
View File

@ -5,23 +5,23 @@ EXPORTS
is_scanner_online is_scanner_online
uninitialize uninitialize
log_info log_info
sane_hgsane_init sane_unissane_init
sane_hgsane_exit sane_unissane_exit
sane_hgsane_get_devices sane_unissane_get_devices
sane_hgsane_open sane_unissane_open
sane_hgsane_close sane_unissane_close
sane_hgsane_get_option_descriptor sane_unissane_get_option_descriptor
sane_hgsane_control_option sane_unissane_control_option
sane_hgsane_get_parameters sane_unissane_get_parameters
sane_hgsane_start sane_unissane_start
sane_hgsane_read sane_unissane_read
sane_hgsane_cancel sane_unissane_cancel
sane_hgsane_set_io_mode sane_unissane_set_io_mode
sane_hgsane_get_select_fd sane_unissane_get_select_fd
sane_hgsane_strstatus sane_unissane_strstatus
sane_hgsane_init_ex sane_unissane_init_ex
sane_hgsane_io_control sane_unissane_io_control
sane_hgsane_err_desc sane_unissane_err_desc
sane_hgsane_get_option_descriptor_ex sane_unissane_get_option_descriptor_ex
sane_hgsane_control_option_ex sane_unissane_control_option_ex
sane_hgsane_read_ext_info sane_unissane_read_ext_info