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

increase sub version to 21; LOG sane_cancel

This commit is contained in:
gb 2022-08-20 10:36:34 +08:00
parent 3b04b49c3c
commit b91410855f
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -4,7 +4,7 @@ cpu=$(arch) #cpu架构
sys=$(cat /etc/issue) sys=$(cat /etc/issue)
sys=${sys%% *} #操作系统 sys=${sys%% *} #操作系统
mainverstr="s/ver_1/4/g" #版本控制 mainverstr="s/ver_1/4/g" #版本控制
minver="20" minver="21"
minverstr="s/ver_2/" minverstr="s/ver_2/"
verstr3="s/ver_3/" verstr3="s/ver_3/"
ver3=10 ver3=10

6
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1155,11 +1155,7 @@ int hg_scanner_239::read_one_image_from_usb(SANE_Image_Statu statu)
} }
else else
{ {
char msg[128]; VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Read image data from USB err: %s\n", hg_scanner_err_name(ret));
sprintf(msg, "Read image data from USB err: %s\n", hg_scanner_err_name(ret));
LOG_INFO(LOG_LEVEL_DEBUG_INFO, msg);
notify_ui_working_status(msg);
notify_ui_working_status(STATU_DESC_SCANNER_ERR_TIMEOUT, SANE_EVENT_ERROR);
} }
} }
} }

2
hgsane/sane_hg_mdw.cpp
View File

@ -1981,6 +1981,8 @@ extern "C" { // avoid compiler exporting name in C++ style !!!
} }
void inner_sane_cancel(SANE_Handle handle) void inner_sane_cancel(SANE_Handle handle)
{ {
LOG_INFO(LOG_LEVEL_ALL, "sane_cancel\n");
hg_sane_middleware::instance()->stop(handle); hg_sane_middleware::instance()->stop(handle);
} }
SANE_Status inner_sane_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking) SANE_Status inner_sane_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking)