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

v4.27

This commit is contained in:
gb 2022-09-23 16:47:00 +08:00
parent ffa101ae6b
commit 7b4a3379d1
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device/scanner.rc
View File

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

3
sane/s2t_api.h
View File

@ -391,7 +391,10 @@ namespace sane_opts
if(ind > 0) \
ret = object->set_value(ind, val); \
else \
{ \
ret = SCANNER_ERR_INVALID_PARAMETER; \
load_sane_util::log_info((std::wstring(L"Fatal: property '") + L###id_name + L"' not found !!!\r\n").c_str(), 0); \
} \
}
typedef unsigned int SCANNERID;

8
sane/sane.rc
View File

@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,26,10000,22264
PRODUCTVERSION 4,26,10000,22264
FILEVERSION 4,27,10000,22266
PRODUCTVERSION 4,27,10000,22266
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.26.10000.22264"
VALUE "FileVersion", "4.27.10000.22266"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.26.10000.22264"
VALUE "ProductVersion", "4.27.10000.22266"
END
END
BLOCK "VarFileInfo"

23
sane/scanner.cpp
View File

@ -576,26 +576,43 @@ void scanner::extension_text_direction(int id)
void scanner::extension_page(int id)
{
EXAPI ea;
wchar_t msg[128] = { 0 };
ea.ind = ex_duplex_id_ = ex_id_++;
ea.base_ind = id;
ea.ex_api = &scanner::handle_ex_duplex;
ex_opts_.push_back(ea);
{
swprintf_s(msg, _countof(msg) - 1, L"handle_ex_duplex of id: %d\r\n", ea.ind);
log_info(msg, 0);
}
ea.ind = ex_discard_blank_page_id_ = ex_id_++;
ea.base_ind = id;
ea.ex_api = &scanner::handle_ex_discard_blank_page;
ex_opts_.push_back(ea);
{
swprintf_s(msg, _countof(msg) - 1, L"handle_ex_discard_blank_page of id: %d\r\n", ea.ind);
log_info(msg, 0);
}
ea.ind = ex_discard_blank_receipt_id_ = ex_id_++;
ea.base_ind = id;
ea.ex_api = &scanner::handle_ex_discard_blank_receipt;
ex_opts_.push_back(ea);
{
swprintf_s(msg, _countof(msg) - 1, L"handle_ex_discard_blank_receipt of id: %d\r\n", ea.ind);
log_info(msg, 0);
}
ea.ind = ex_is_page_fold_id_ = ex_id_++;
ea.base_ind = id;
ea.ex_api = &scanner::handle_ex_page_fold;
ex_opts_.push_back(ea);
{
swprintf_s(msg, _countof(msg) - 1, L"handle_ex_page_fold of id: %d\r\n", ea.ind);
log_info(msg, 0);
}
}
void scanner::extension_erase_color(int id)
{
@ -1976,6 +1993,12 @@ COM_API_IMPLEMENT(scanner, int, set_value(int sn, void* val))
SANE_Int after = 0;
SANE_Option_Descriptor* desc = hg_sane_middleware::instance()->get_option_descriptor(handle_, sn);
{
wchar_t msg[128] = { 0 };
swprintf_s(msg, _countof(msg) - 1, L"set_value of ID: %d\r\n", sn);
log_info(msg, 0);
}
if (ex == ex_opts_.end())
{
if (!set_option_value_with_parent(sn, val, &ret))