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

HGTwainUser回调接口调整

This commit is contained in:
luoliangyi 2023-10-16 10:38:35 +08:00
parent 727876c81d
commit 68051bb2df
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scanner2/device_user.cpp
View File

@ -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; DeviceUser* p = (DeviceUser*)param;
emit p->newImage(image); emit p->newImage(image);
return HGBASE_ERR_OK;
} }
#else #else

2
app/scanner2/device_user.h
View File

@ -55,7 +55,7 @@ public:
private: private:
static void HGAPI DSEventFunc(HGTwainDS ds, HGUInt event, HGPointer param); 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: signals:
void newImage(void *image); void newImage(void *image);

2
modules/twain_user/HGTwain.h
View File

@ -43,7 +43,7 @@ typedef struct
/* ds回调 /* ds回调
*/ */
typedef void (HGAPI *HGDSEventFunc)(HGTwainDS ds, HGUInt event, HGPointer param); 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); HGEXPORT HGResult HGAPI HGTwain_CreateDSM(HWND hwnd, HGTwainDSM *dsm);

3
modules/twain_user/HGTwainErr.h
View File

@ -10,4 +10,7 @@
/* 设备离线 */ /* 设备离线 */
#define HGTWAIN_ERR_DEVICEOFFLINE 0x00001003L #define HGTWAIN_ERR_DEVICEOFFLINE 0x00001003L
/* 停止扫描 */
#define HGSANE_ERR_STOPSCAN 0x00001004L
#endif /* __HGTWAINERR_H__ */ #endif /* __HGTWAINERR_H__ */

5
modules/twain_user/HGTwainImpl.cpp
View File

@ -1037,7 +1037,10 @@ void HGAPI HGTwainDSImpl::ThreadFunc(HGThread thread, HGPointer param)
if (NULL != image) if (NULL != image)
{ {
if (NULL != p->m_imageFunc) 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); HGBase_DestroyImage(image);
} }