From eae7d787c2c4b847add38e45c1ed10f47c918e47 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 10 Nov 2023 14:42:53 +0800
Subject: [PATCH] adjust files path

---
 device/scannerqd.vcxproj         | 18 ++++++++----
 device/scannerqd.vcxproj.filters | 49 +++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/device/scannerqd.vcxproj b/device/scannerqd.vcxproj
index 85be424..80939d3 100644
--- a/device/scannerqd.vcxproj
+++ b/device/scannerqd.vcxproj
@@ -221,14 +221,13 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\image_process.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\PaperSize.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_fs.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_manager.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_setting.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
@@ -268,11 +267,15 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageMultiOutputRed.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.cpp" />
-    <ClCompile Include="..\..\code_device\sdk\hginclude\base_opt.cpp" />
     <ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp" />
     <ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\imgprc\imgprc_mgr.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\imgprc\img_processor.cpp" />
     <ClCompile Include="..\..\code_device\sdk\json\cJSON.c" />
     <ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\base_opt.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\device_opt.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\simple_logic.cpp" />
     <ClCompile Include="scanner_io\scanner_io.cpp" />
     <ClCompile Include="win_usb\usbview\devnode.c" />
     <ClCompile Include="win_usb\usbview\enum.c" />
@@ -291,15 +294,14 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\image_process.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\PaperSize.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_fs.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_manager.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_setting.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.h" />
@@ -341,12 +343,16 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\imgprocdefs.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\IMulti.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\MatEx.h" />
-    <ClInclude Include="..\..\code_device\sdk\hginclude\base_opt.h" />
     <ClInclude Include="..\..\code_device\sdk\hginclude\huagaoxxx_warraper_ex.h" />
     <ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h" />
     <ClInclude Include="..\..\code_device\sdk\hginclude\utils.h" />
+    <ClInclude Include="..\..\code_device\sdk\imgprc\imgprc_mgr.h" />
+    <ClInclude Include="..\..\code_device\sdk\imgprc\img_processor.h" />
     <ClInclude Include="..\..\code_device\sdk\json\cJSON.h" />
     <ClInclude Include="..\..\code_device\sdk\json\gb_json.h" />
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\base_opt.h" />
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\device_opt.h" />
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\simple_logic.h" />
     <ClInclude Include="..\..\sdk\include\huagao\brand.h" />
     <ClInclude Include="..\..\sdk\include\huagao\brand_ct.h" />
     <ClInclude Include="..\..\sdk\include\huagao\brand_hw.h" />
diff --git a/device/scannerqd.vcxproj.filters b/device/scannerqd.vcxproj.filters
index 20403db..7e53d8b 100644
--- a/device/scannerqd.vcxproj.filters
+++ b/device/scannerqd.vcxproj.filters
@@ -37,6 +37,9 @@
     <Filter Include="dev\user-opt">
       <UniqueIdentifier>{0a1c6e85-c047-40a6-8791-eb35ea41492b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="dev\imgproc">
+      <UniqueIdentifier>{2b2d3244-6956-4b7d-be61-055ba42e07e7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp">
@@ -222,21 +225,30 @@
     <ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp">
-      <Filter>dev\user-opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp">
-      <Filter>dev\user-opt</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp">
       <Filter>dev\user-opt</Filter>
     </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.cpp">
       <Filter>dev\user-opt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\sdk\hginclude\base_opt.cpp">
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\base_opt.cpp">
       <Filter>dev\user-opt</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\device_opt.cpp">
+      <Filter>dev\user-opt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\sane_opt_json\simple_logic.cpp">
+      <Filter>dev\user-opt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\imgprc\img_processor.cpp">
+      <Filter>dev\imgproc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\imgprc\imgprc_mgr.cpp">
+      <Filter>dev\imgproc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.cpp">
+      <Filter>dev\imgproc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@@ -485,21 +497,30 @@
     <ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h">
-      <Filter>dev\user-opt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h">
-      <Filter>dev\user-opt</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\sdk\hginclude\base_opt.h">
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\base_opt.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\device_opt.h">
+      <Filter>dev\user-opt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\sane_opt_json\simple_logic.h">
+      <Filter>dev\user-opt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\imgprc\img_processor.h">
+      <Filter>dev\imgproc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\imgprc\imgprc_mgr.h">
+      <Filter>dev\imgproc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.h">
+      <Filter>dev\imgproc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="device.def">