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

HGSaneUser和HGTwainUser修改接口，以支持双张图像

This commit is contained in:
luoliangyi 2023-10-16 10:10:47 +08:00
parent 964147ddd6
commit 308e529d3d
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scanner2/device_user.cpp
View File

@ -167,7 +167,7 @@ void HGAPI DeviceUser::DSEventFunc(HGTwainDS ds, HGUInt event, HGPointer param)
}
}
void HGAPI DeviceUser::DSImageFunc(HGTwainDS ds, HGImage image, HGPointer param)
void HGAPI DeviceUser::DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param)
{
DeviceUser* p = (DeviceUser*)param;
emit p->newImage(image);
@ -372,7 +372,7 @@ void HGAPI DeviceUser::DeviceEventFunc(HGSaneDevice dev, HGUInt event, HGPointer
}
}
void HGAPI DeviceUser::DeviceImageFunc(HGSaneDevice dev, HGImage image, HGPointer param)
void HGAPI DeviceUser::DeviceImageFunc(HGSaneDevice dev, HGImage image, HGUInt type, HGPointer param)
{
DeviceUser* p = (DeviceUser*)param;
emit p->newImage(image);

4
app/scanner2/device_user.h
View File

@ -55,7 +55,7 @@ public:
private:
static void HGAPI DSEventFunc(HGTwainDS ds, HGUInt event, HGPointer param);
static void HGAPI DSImageFunc(HGTwainDS ds, HGImage image, HGPointer param);
static void HGAPI DSImageFunc(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
signals:
void newImage(void *image);
@ -120,7 +120,7 @@ public:
private:
static void HGAPI DeviceEventFunc(HGSaneDevice dev, HGUInt event, HGPointer param);
static void HGAPI DeviceImageFunc(HGSaneDevice dev, HGImage image, HGPointer param);
static void HGAPI DeviceImageFunc(HGSaneDevice dev, HGImage image, HGUInt type, HGPointer param);
signals:
void newImage(void *image);

5
modules/sane_user/HGSane.h
View File

@ -39,10 +39,13 @@ typedef struct
#define HGSANE_EVENT_TYPE_WORKING 1L
#define HGSANE_EVENT_TYPE_SCANFINISHED 2L
#define HGSANE_IMAGE_TYPE_NORMAL 0L
#define HGSANE_IMAGE_TYPE_DOUBLE 1L
/* Sane回调
*/
typedef void (HGAPI* HGSane_DeviceEventFunc)(HGSaneDevice dev, HGUInt event, HGPointer param);
typedef void (HGAPI* HGSane_DeviceImageFunc)(HGSaneDevice dev, HGImage image, HGPointer param);
typedef void (HGAPI* HGSane_DeviceImageFunc)(HGSaneDevice dev, HGImage image, HGUInt type, HGPointer param);
HGEXPORT HGResult HGAPI HGSane_CreateManager(HGSaneManager *manager);

4
modules/twain_user/HGTwain.h
View File

@ -38,10 +38,12 @@ typedef struct
#define HGTWAIN_EVENT_TYPE_WORKING 1L
#define HGTWAIN_EVENT_TYPE_SCANFINISHED 2L
#define HGTWAIN_IMAGE_TYPE_NORMAL 0L
/* ds回调
*/
typedef void (HGAPI *HGDSEventFunc)(HGTwainDS ds, HGUInt event, HGPointer param);
typedef void (HGAPI* HGDSImageFunc)(HGTwainDS ds, HGImage image, HGPointer param);
typedef void (HGAPI* HGDSImageFunc)(HGTwainDS ds, HGImage image, HGUInt type, HGPointer param);
HGEXPORT HGResult HGAPI HGTwain_CreateDSM(HWND hwnd, HGTwainDSM *dsm);

2
modules/twain_user/HGTwainImpl.cpp
View File

@ -1037,7 +1037,7 @@ void HGAPI HGTwainDSImpl::ThreadFunc(HGThread thread, HGPointer param)
if (NULL != image)
{
if (NULL != p->m_imageFunc)
p->m_imageFunc((HGTwainDS)p, image, p->m_imageParam);
p->m_imageFunc((HGTwainDS)p, image, HGTWAIN_IMAGE_TYPE_NORMAL, p->m_imageParam);
HGBase_DestroyImage(image);
}