lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re-arrange source file

This commit is contained in:
gb 2023-09-08 17:44:45 +08:00
parent e8a7f8a684
commit b59d92baf8
6 changed files with 92 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device/device.def
View File

@ -6,8 +6,8 @@ EXPORTS
hg_scanner_enum
hg_scanner_open
hg_scanner_close
hg_scanner_get_parameter
hg_scanner_set_parameter
hg_scanner_get_option
hg_scanner_set_option
hg_scanner_start
hg_scanner_stop
hg_scanner_get_img_info

13
device/scanner.vcxproj
View File

@ -212,6 +212,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\common_setting.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\device_opt.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_ipc.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_200.cpp" />
@ -221,10 +222,11 @@ 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\jsonconfig.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\simple_logic.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
@ -266,6 +268,8 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.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" />
<ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp" />
<ClCompile Include="scanner_io\scanner_io.cpp" />
<ClCompile Include="win_usb\usbview\devnode.c" />
<ClCompile Include="win_usb\usbview\enum.c" />
@ -274,6 +278,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
<ItemGroup>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\BlockingQueue.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\common_setting.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\device_opt.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\filetools.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_ipc.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner.h" />
@ -284,12 +289,12 @@ 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\json.hpp" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\jsonconfig.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\PaperSize.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\raw_src.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\simple_logic.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h" />
@ -335,6 +340,8 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
<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\json\cJSON.h" />
<ClInclude Include="..\..\code_device\sdk\json\gb_json.h" />
<ClInclude Include="..\..\sdk\include\huagao\brand.h" />
<ClInclude Include="..\..\sdk\include\huagao\brand_ct.h" />
<ClInclude Include="..\..\sdk\include\huagao\brand_hw.h" />

61
device/scanner.vcxproj.filters
View File

@ -28,6 +28,12 @@
<Filter Include="IO">
<UniqueIdentifier>{3d22771d-a2cc-4972-ab37-f1979d973a4f}</UniqueIdentifier>
</Filter>
<Filter Include="dev\fs">
<UniqueIdentifier>{ab2dd2e9-f5d1-40f8-ad1d-67b97a60e547}</UniqueIdentifier>
</Filter>
<Filter Include="utils">
<UniqueIdentifier>{9e729376-6047-4153-b0b8-dda8f8f722f6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp">
@ -147,9 +153,6 @@
<ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.cpp">
<Filter>dev</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\jsonconfig.cpp">
<Filter>dev</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\PaperSize.cpp">
<Filter>dev</Filter>
</ClCompile>
@ -201,11 +204,26 @@
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp">
<Filter>image</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_fs.cpp">
<Filter>dev\fs</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp">
<Filter>源文件</Filter>
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp">
<Filter>源文件</Filter>
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\sdk\json\cJSON.c">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\device_opt.cpp">
<Filter>dev</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp">
<Filter>dev</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -338,12 +356,6 @@
<ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.h">
<Filter>dev</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\json.hpp">
<Filter>dev</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\jsonconfig.h">
<Filter>dev</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\PaperSize.h">
<Filter>dev</Filter>
</ClInclude>
@ -428,12 +440,6 @@
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.h">
<Filter>image</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\hginclude\utils.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\sdk\include\huagao\brand.h">
<Filter>头文件</Filter>
</ClInclude>
@ -455,6 +461,27 @@
<ClInclude Include="..\..\sdk\include\huagao\brand_zj.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_fs.h">
<Filter>dev\fs</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\hginclude\utils.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\json\cJSON.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\device_opt.h">
<Filter>dev</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h">
<Filter>dev</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="device.def">

21
sane/sane.vcxproj
View File

@ -73,7 +73,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
@ -81,7 +81,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
@ -91,7 +91,7 @@
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
</PropertyGroup>
@ -99,7 +99,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
</PropertyGroup>
@ -204,17 +204,18 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\code_device\hgsane\cJSON.c" />
<ClCompile Include="..\..\code_device\hgsane\json.cpp" />
<ClCompile Include="..\..\code_device\hgsane\entry.cpp" />
<ClCompile Include="..\..\code_device\hgsane\main.c" />
<ClCompile Include="..\..\code_device\hgsane\sane_hg_mdw.cpp" />
<ClCompile Include="..\..\code_device\hgsane\sane_option.cpp" />
<ClCompile Include="..\..\code_device\hgsane\sane_opt\sane_opts.cpp" />
<ClCompile Include="..\..\code_device\sdk\json\cJSON.c" />
<ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code_device\hgsane\cJSON.h" />
<ClInclude Include="..\..\code_device\hgsane\json.h" />
<ClInclude Include="..\..\code_device\hgsane\sane_hg_mdw.h" />
<ClInclude Include="..\..\code_device\hgsane\sane_option.h" />
<ClInclude Include="..\..\code_device\hgsane\sane_opt\sane_opts.h" />
<ClInclude Include="..\..\code_device\sdk\json\cJSON.h" />
<ClInclude Include="..\..\code_device\sdk\json\gb_json.h" />
<ClInclude Include="..\..\sdk\include\huagao\hgscanner_error.h" />
<ClInclude Include="..\..\code_device\sdk\hginclude\huagaoxxx_warraper_ex.h" />
<ClInclude Include="..\..\sdk\include\sane\sane.h" />

41
sane/sane.vcxproj.filters
View File

@ -13,31 +13,34 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="json">
<UniqueIdentifier>{4729d343-3a52-4c6c-8239-7de6d820f184}</UniqueIdentifier>
</Filter>
<Filter Include="sane_opt">
<UniqueIdentifier>{2204d16a-4bdb-4121-b96a-44b6a6310b06}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\code_device\hgsane\cJSON.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\json.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\main.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\sane_hg_mdw.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\sane_option.cpp">
<ClCompile Include="..\..\code_device\sdk\json\cJSON.c">
<Filter>json</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
<Filter>json</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\entry.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgsane\sane_opt\sane_opts.cpp">
<Filter>sane_opt</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code_device\hgsane\cJSON.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgsane\json.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgsane\sane_hg_mdw.h">
<Filter>头文件</Filter>
</ClInclude>
@ -62,15 +65,21 @@
<ClInclude Include="..\..\code_device\sdk\hginclude\huagaoxxx_warraper_ex.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgsane\sane_option.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\sdk\include\sane\sane_option_definitions.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\json\cJSON.h">
<Filter>json</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
<Filter>json</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgsane\sane_opt\sane_opts.h">
<Filter>sane_opt</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="sane.def">

3
sln/hgscanner.sln
View File

@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 16.0.33214.272
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sane", "..\sane\sane.vcxproj", "{6EEC8A02-7F98-4422-8ED6-2434D43BD1E1}"
ProjectSection(ProjectDependencies) = postProject
{9ED4B425-73E0-423E-9712-455E777481B4} = {9ED4B425-73E0-423E-9712-455E777481B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scanner", "..\device\scanner.vcxproj", "{9ED4B425-73E0-423E-9712-455E777481B4}"
ProjectSection(ProjectDependencies) = postProject