diff --git a/build.sh b/build.sh index f7fc013..8d3c5f9 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ cpu=$(arch) #cpu架构 sys=$(cat /etc/issue) sys=${sys%% *} #操作系统 mainverstr="s/ver_1/4/g" #版本控制 -minver="20" +minver="21" minverstr="s/ver_2/" verstr3="s/ver_3/" ver3=10 diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 0d29df3..7f2f273 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -1155,11 +1155,7 @@ int hg_scanner_239::read_one_image_from_usb(SANE_Image_Statu statu) } else { - char msg[128]; - 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); + VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Read image data from USB err: %s\n", hg_scanner_err_name(ret)); } } } diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index 2d8544d..30adb9d 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -1981,6 +1981,8 @@ extern "C" { // avoid compiler exporting name in C++ style !!! } void inner_sane_cancel(SANE_Handle handle) { + LOG_INFO(LOG_LEVEL_ALL, "sane_cancel\n"); + hg_sane_middleware::instance()->stop(handle); } SANE_Status inner_sane_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking)