From 308e529d3d1c5f83de06451b8bf05d0d9782d042 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Mon, 16 Oct 2023 10:10:47 +0800
Subject: [PATCH] =?UTF-8?q?HGSaneUser=E5=92=8CHGTwainUser=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=8C=E5=BC=A0=E5=9B=BE=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner2/device_user.cpp       | 4 ++--
 app/scanner2/device_user.h         | 4 ++--
 modules/sane_user/HGSane.h         | 5 ++++-
 modules/twain_user/HGTwain.h       | 4 +++-
 modules/twain_user/HGTwainImpl.cpp | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/scanner2/device_user.cpp b/app/scanner2/device_user.cpp
index 0d6f2540..a8498d62 100644
--- a/app/scanner2/device_user.cpp
+++ b/app/scanner2/device_user.cpp
@@ -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);
diff --git a/app/scanner2/device_user.h b/app/scanner2/device_user.h
index 86c71a91..6a153d85 100644
--- a/app/scanner2/device_user.h
+++ b/app/scanner2/device_user.h
@@ -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);
diff --git a/modules/sane_user/HGSane.h b/modules/sane_user/HGSane.h
index 5704d60b..8db30a2c 100644
--- a/modules/sane_user/HGSane.h
+++ b/modules/sane_user/HGSane.h
@@ -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);
 
diff --git a/modules/twain_user/HGTwain.h b/modules/twain_user/HGTwain.h
index 6a041503..141648e7 100644
--- a/modules/twain_user/HGTwain.h
+++ b/modules/twain_user/HGTwain.h
@@ -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);
 
diff --git a/modules/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp
index 8cf973e3..906ac539 100644
--- a/modules/twain_user/HGTwainImpl.cpp
+++ b/modules/twain_user/HGTwainImpl.cpp
@@ -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);
             }