increase sub version to 21; LOG sane_cancel
This commit is contained in:
parent
3b04b49c3c
commit
b91410855f
2
build.sh
2
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
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue