调整SANE属性结构

device/scannerqd.vcxproj

@@ -268,6 +268,7 @@ 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\json\cJSON.c" />
@@ -296,7 +297,6 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <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\base_opt.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" />
@@ -341,6 +341,7 @@ 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" />

device/scannerqd.vcxproj.filters

@@ -234,6 +234,9 @@
     <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">
+      <Filter>dev\user-opt</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@@ -491,10 +494,10 @@
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\base_opt.h">
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.h">
+    <ClInclude Include="..\..\code_device\sdk\hginclude\base_opt.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
   </ItemGroup>

lang/yuyanbao.vcxproj

@@ -218,6 +218,9 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
   <ItemGroup>
     <None Include="yuyanbao.def" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\code_lang\CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

lang/yuyanbao.vcxproj.filters

@@ -47,4 +47,7 @@
       <Filter>源文件</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\code_lang\CMakeLists.txt" />
+  </ItemGroup>
 </Project>

sln/hgscanner.sln

@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{53E5EDD9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgjson", "..\..\doc_and_tools\tools\apps\hgjson\hgjson.vcxproj", "{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_TWAIN_App", "..\..\doc_and_tools\tools\apps\test_TWAIN_App\test_TWAIN_App.vcxproj", "{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -72,6 +74,14 @@ Global
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x64.ActiveCfg = Release|Win32
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.ActiveCfg = Release|Win32
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.Build.0 = Release|Win32
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x64.ActiveCfg = Debug|x64
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x64.Build.0 = Debug|x64
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x86.ActiveCfg = Debug|Win32
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x86.Build.0 = Debug|Win32
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x64.ActiveCfg = Release|x64
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x64.Build.0 = Release|x64
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x86.ActiveCfg = Release|Win32
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,6 +92,7 @@ Global
 		{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
 		{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
+		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A89068FF-95C4-3C1E-B126-70B66C9824BB}