1、解决国产系统双张保留后报无纸错误的问题;BUG-919
2、解决国产系统,安卓设备第一次扫描时双张报扫描完成的问题;BUG-931
This commit is contained in:
parent
2379c29207
commit
2ac71f54e3
|
@ -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 (NULL != p->m_scanNotify)
|
||||
{
|
||||
p->m_scanNotify((int)SANE_EVENT_SCAN_FINISHED, (void*)saneAPI.sane_strstatus_api(stat), (int)stat);
|
||||
return;
|
||||
}
|
||||
|
||||
if (HGSANE_ERR_UI_DISCARD_STOP == doubleImgStat)
|
||||
return;
|
||||
|
@ -1171,8 +1174,18 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
|
|||
}
|
||||
|
||||
if (!p->m_cancelScan)
|
||||
{
|
||||
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 (NULL != p->m_scanNotify)
|
||||
|
|
Loading…
Reference in New Issue