From 620bb87ae7244d4a67aa8baa55e195d9b83a2485 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Fri, 10 Mar 2023 17:44:43 +0800
Subject: [PATCH] fatch conflict

---
 device/scanner.rc | 10 +++++-----
 sane/sane.def     | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/device/scanner.rc b/device/scanner.rc
index 360552f..dbb9e78 100644
--- a/device/scanner.rc
+++ b/device/scanner.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,34,10000,22310
- PRODUCTVERSION 4,34,10000,22310
+ FILEVERSION 4,40,17100,23069
+ PRODUCTVERSION 4,40,17100,23069
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "宁波华高信息科技有限公司"
             VALUE "FileDescription", "华高扫描仪应用程序"
-            VALUE "FileVersion", "4.34.10000.22310"
+            VALUE "FileVersion", "4.40.17100.23069"
             VALUE "InternalName", "scanner.dll"
-            VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022"
+            VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2023"
             VALUE "OriginalFilename", "scanner.dll"
             VALUE "ProductName", "HUAGOScan"
-            VALUE "ProductVersion", "4.34.10000.22310"
+            VALUE "ProductVersion", "4.40.17100.23069"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/sane/sane.def b/sane/sane.def
index 13abb0a..029fa3c 100644
--- a/sane/sane.def
+++ b/sane/sane.def
@@ -5,23 +5,23 @@ EXPORTS
     is_scanner_online
     uninitialize
     log_info
-    sane_hgsane_init
-    sane_hgsane_exit
-    sane_hgsane_get_devices
-    sane_hgsane_open
-    sane_hgsane_close
-    sane_hgsane_get_option_descriptor
-    sane_hgsane_control_option
-    sane_hgsane_get_parameters
-    sane_hgsane_start
-    sane_hgsane_read
-    sane_hgsane_cancel
-    sane_hgsane_set_io_mode
-    sane_hgsane_get_select_fd
-    sane_hgsane_strstatus
-    sane_hgsane_init_ex
-    sane_hgsane_io_control
-    sane_hgsane_err_desc
-    sane_hgsane_get_option_descriptor_ex
-    sane_hgsane_control_option_ex
-    sane_hgsane_read_ext_info
\ No newline at end of file
+    sane_unissane_init
+    sane_unissane_exit
+    sane_unissane_get_devices
+    sane_unissane_open
+    sane_unissane_close
+    sane_unissane_get_option_descriptor
+    sane_unissane_control_option
+    sane_unissane_get_parameters
+    sane_unissane_start
+    sane_unissane_read
+    sane_unissane_cancel
+    sane_unissane_set_io_mode
+    sane_unissane_get_select_fd
+    sane_unissane_strstatus
+    sane_unissane_init_ex
+    sane_unissane_io_control
+    sane_unissane_err_desc
+    sane_unissane_get_option_descriptor_ex
+    sane_unissane_control_option_ex
+    sane_unissane_read_ext_info
\ No newline at end of file