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

1、解决国产系统双张保留后报无纸错误的问题；BUG-919 

2、解决国产系统，安卓设备第一次扫描时双张报扫描完成的问题；BUG-931
This commit is contained in:
yangjiaxuan 2024-03-10 20:27:03 +08:00
parent 2379c29207
commit 2ac71f54e3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/sane_user/HGSaneImpl.cpp
View File

@ -1019,7 +1019,10 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
if ((SCANNER_ERR_DEVICE_DOUBLE_FEEDING == stat && HGSANE_ERR_UI_RESERVE_CHECK != doubleImgStat)) if ((SCANNER_ERR_DEVICE_DOUBLE_FEEDING == stat && HGSANE_ERR_UI_RESERVE_CHECK != doubleImgStat))
{ {
if (NULL != p->m_scanNotify) if (NULL != p->m_scanNotify)
{
p->m_scanNotify((int)SANE_EVENT_SCAN_FINISHED, (void*)saneAPI.sane_strstatus_api(stat), (int)stat); p->m_scanNotify((int)SANE_EVENT_SCAN_FINISHED, (void*)saneAPI.sane_strstatus_api(stat), (int)stat);
return;
}
if (HGSANE_ERR_UI_DISCARD_STOP == doubleImgStat) if (HGSANE_ERR_UI_DISCARD_STOP == doubleImgStat)
return; return;
@ -1172,7 +1175,17 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
if (!p->m_cancelScan) if (!p->m_cancelScan)
{ {
stat = saneAPI.sane_start_api(p->m_devHandle); if (stat == SANE_STATUS_GOOD)
{
stat = saneAPI.sane_start_api(p->m_devHandle);
}
else if (stat != SANE_STATUS_GOOD)
{
stat = saneAPI.sane_start_api(p->m_devHandle);
if (stat == SANE_STATUS_NO_DOCS)
stat = saneAPI.sane_start_api(p->m_devHandle);
}
if (SANE_STATUS_NO_DOCS == stat) if (SANE_STATUS_NO_DOCS == stat)
{ {
if (NULL != p->m_scanNotify) if (NULL != p->m_scanNotify)