This commit is contained in:
parent
7a4a179d82
commit
eeb9059656
|
@ -130,7 +130,7 @@ unix {
|
||||||
|
|
||||||
LIBS += -lpthread -ldl
|
LIBS += -lpthread -ldl
|
||||||
LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc\
|
LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc\
|
||||||
-l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser
|
-l$${OEM_PREFIX2}TwainUI -l$${OEM_PREFIX2}SaneUser
|
||||||
|
|
||||||
LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -llang
|
LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -llang
|
||||||
}
|
}
|
||||||
|
|
|
@ -663,6 +663,7 @@ HGResult HGSaneDeviceImpl::Init(const HGChar* devName, SANE_Handle handle)
|
||||||
m_devName = devName;
|
m_devName = devName;
|
||||||
m_sourceImpl->m_saneApi.sane_set_io_mode_api(handle, SANE_FALSE);
|
m_sourceImpl->m_saneApi.sane_set_io_mode_api(handle, SANE_FALSE);
|
||||||
m_devHandle = handle;
|
m_devHandle = handle;
|
||||||
|
apply_current_config(m_devName.c_str(), m_devHandle, &m_sourceImpl->m_saneApi);
|
||||||
return HGBASE_ERR_OK;
|
return HGBASE_ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -694,6 +695,7 @@ HGResult HGSaneDeviceImpl::Open(const HGChar* devName, HGChar* errInfo, HGUInt e
|
||||||
m_devName = devName;
|
m_devName = devName;
|
||||||
m_sourceImpl->m_saneApi.sane_set_io_mode_api(handle, SANE_FALSE);
|
m_sourceImpl->m_saneApi.sane_set_io_mode_api(handle, SANE_FALSE);
|
||||||
m_devHandle = handle;
|
m_devHandle = handle;
|
||||||
|
apply_current_config(m_devName.c_str(), m_devHandle, &m_sourceImpl->m_saneApi);
|
||||||
return HGBASE_ERR_OK;
|
return HGBASE_ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -827,6 +829,7 @@ HGResult HGSaneDeviceImpl::ShowSettingDlg(HGWindow parent)
|
||||||
return HGSANE_ERR_DEVICEOFFLINE;
|
return HGSANE_ERR_DEVICEOFFLINE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_curDevice = this;
|
||||||
int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback);
|
int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback);
|
||||||
if (0 != ret)
|
if (0 != ret)
|
||||||
{
|
{
|
||||||
|
@ -962,7 +965,6 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
|
||||||
if (NULL != p->m_eventFunc)
|
if (NULL != p->m_eventFunc)
|
||||||
p->m_eventFunc((HGSaneDevice)p, HGSANE_EVENT_TYPE_WORKING, p->m_eventParam);
|
p->m_eventFunc((HGSaneDevice)p, HGSANE_EVENT_TYPE_WORKING, p->m_eventParam);
|
||||||
|
|
||||||
int imageCount = 0;
|
|
||||||
while (!p->m_stopThread)
|
while (!p->m_stopThread)
|
||||||
{
|
{
|
||||||
SANE_Parameters params;
|
SANE_Parameters params;
|
||||||
|
|
Loading…
Reference in New Issue