HGTwainUser回调接口调整
This commit is contained in:
parent
727876c81d
commit
68051bb2df
|
@ -167,10 +167,11 @@ void HGAPI DeviceUser::DSEventFunc(HGTwainDS ds, HGUInt event, HGPointer param)
|
|||
}
|
||||
}
|
||||
|
||||
void HGAPI DeviceUser::DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param)
|
||||
HGUInt HGAPI DeviceUser::DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param)
|
||||
{
|
||||
DeviceUser* p = (DeviceUser*)param;
|
||||
emit p->newImage(image);
|
||||
return HGBASE_ERR_OK;
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
|
||||
private:
|
||||
static void HGAPI DSEventFunc(HGTwainDS ds, HGUInt event, HGPointer param);
|
||||
static void HGAPI DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
|
||||
static HGUInt HGAPI DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
|
||||
|
||||
signals:
|
||||
void newImage(void *image);
|
||||
|
|
|
@ -43,7 +43,7 @@ typedef struct
|
|||
/* ds回调
|
||||
*/
|
||||
typedef void (HGAPI *HGDSEventFunc)(HGTwainDS ds, HGUInt event, HGPointer param);
|
||||
typedef void (HGAPI* HGDSImageFunc)(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
|
||||
typedef HGUInt (HGAPI* HGDSImageFunc)(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
|
||||
|
||||
HGEXPORT HGResult HGAPI HGTwain_CreateDSM(HWND hwnd, HGTwainDSM *dsm);
|
||||
|
||||
|
|
|
@ -10,4 +10,7 @@
|
|||
/* 设备离线 */
|
||||
#define HGTWAIN_ERR_DEVICEOFFLINE 0x00001003L
|
||||
|
||||
/* 停止扫描 */
|
||||
#define HGSANE_ERR_STOPSCAN 0x00001004L
|
||||
|
||||
#endif /* __HGTWAINERR_H__ */
|
||||
|
|
|
@ -1037,7 +1037,10 @@ void HGAPI HGTwainDSImpl::ThreadFunc(HGThread thread, HGPointer param)
|
|||
if (NULL != image)
|
||||
{
|
||||
if (NULL != p->m_imageFunc)
|
||||
p->m_imageFunc((HGTwainDS)p, image, HGTWAIN_IMAGE_TYPE_NORMAL, p->m_imageParam);
|
||||
{
|
||||
HGUInt imgRet = p->m_imageFunc((HGTwainDS)p, image, HGTWAIN_IMAGE_TYPE_NORMAL, p->m_imageParam);
|
||||
assert(HGBASE_ERR_OK == imgRet);
|
||||
}
|
||||
HGBase_DestroyImage(image);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue