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

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev

This commit is contained in:
13038267101 2024-02-27 11:46:50 +08:00
parent 36bf3518e2 637d282882
commit 4b458f9ee5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hgdriver/hgdev/hg_scanner.cpp
View File

@ -4241,7 +4241,20 @@ int hg_scanner::wait_one_image_from_start(bool& handled)
get_scanner_paperon(has_paper);
if (has_paper == SANE_TRUE)
handled = false;
{
// for BUG-905: 设置了扫描指定张数属性后，返回一次SCANNER_ERR_DEVICE_NO_PAPER
if (usb_img_index_ && scan_count_ != -1)
{
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "return SCANNER_ERR_DEVICE_NO_PAPER in start while scanning with given counts(%d) has finished (received %d papers/images)!\n", scan_count_, usb_img_index_);
usb_img_index_ = 0;
ret = SCANNER_ERR_DEVICE_NO_PAPER;
}
else
{
// 默认启动新一轮扫描
handled = false;
}
}
else
ret = SCANNER_ERR_DEVICE_NO_PAPER;
}