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

增加339和7823.DS，修复设置界面扫描BUG

This commit is contained in:
gb 2022-09-28 20:01:14 +08:00
parent 98cdfe6402
commit 367868edcd
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_all.bat
View File

@ -63,12 +63,14 @@ if "%OEM%"=="hw" (
build.bat lsc %CPU% onlytwain 0x8739 nov
) else (
build.bat %CPU% 0x100 %NOV%
build.bat %CPU% onlytwain 0x139 nov
build.bat %CPU% onlytwain 0x200 nov
build.bat %CPU% onlytwain 0x239 nov
build.bat %CPU% onlytwain 0x300 nov
build.bat %CPU% onlytwain 0x302 nov
build.bat %CPU% onlytwain 0x339 nov
build.bat %CPU% onlytwain 0x400 nov
build.bat %CPU% onlytwain 0x139 nov
build.bat %CPU% onlytwain 0x239 nov
build.bat %CPU% onlytwain 0x439 nov
build.bat %CPU% onlytwain 0x402 nov
build.bat %CPU% onlytwain 0x439 nov
build.bat %CPU% onlytwain 0x7823 nov
)

13
sane/scanner.cpp
View File

@ -1768,9 +1768,10 @@ COM_API_IMPLEMENT(scanner, int, start(void))
else
{
std::wstring msg(local_trans::a2u(hg_scanner_err_description(ret), CP_UTF8));
HWND parent = setting_.get() ? setting_->hwnd() : NULL;
if (indicator_.get())
indicator_.reset();
MessageBoxW(NULL, msg.c_str(), L"\u542F\u52A8\u5931\u8D25", MB_OK | MB_ICONERROR);
indicator_->show(false);
MessageBoxW(parent, msg.c_str(), L"\u542F\u52A8\u5931\u8D25", MB_OK | MB_ICONERROR);
}
prev_start_result_ = ret;
is_scanning_ = ret == SANE_STATUS_GOOD;
@ -2209,6 +2210,14 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
{
SANEAPI api = { NULL };
if (with_scan)
{
events_.clear();
images_.clear();
scan_msg_ = "OK";
scan_err_ = false;
}
api.sane_cancel_api = inner_sane_cancel;
api.sane_close_api = inner_sane_close;
api.sane_control_option_api = inner_sane_control_option;