Merge branch 'master' of http://cd.holdtecs.net:8099/sane/code_device
This commit is contained in:
commit
9af52f72f1
2
build.sh
2
build.sh
|
@ -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="22"
|
minver="23"
|
||||||
minverstr="s/ver_2/"
|
minverstr="s/ver_2/"
|
||||||
verstr3="s/ver_3/"
|
verstr3="s/ver_3/"
|
||||||
ver3=10
|
ver3=10
|
||||||
|
|
|
@ -737,7 +737,7 @@ void hg_scanner::thread_handle_image_process(void)
|
||||||
}
|
}
|
||||||
catch (...)
|
catch (...)
|
||||||
{
|
{
|
||||||
VLOG_MINI_1(LOG_LEVEL_FATAL, "FATAL: Insufficeint memory when proecss image with %d bytes.\n", tiny_buffer->size());
|
VLOG_MINI_1(LOG_LEVEL_FATAL, "FATAL: Insufficient memory when proecss image with %d bytes.\n", tiny_buffer->size());
|
||||||
stop();
|
stop();
|
||||||
status_ = SCANNER_ERR_INSUFFICIENT_MEMORY;
|
status_ = SCANNER_ERR_INSUFFICIENT_MEMORY;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue