整理目录，将base、imgfmt、imgproc等模块放到modules目录中

build-qt/HGSolution/HGScanner.pro

@@ -84,7 +84,6 @@ unix {
 	}
 }
 
-INCLUDEPATH += $$PWD/../../ui/
 INCLUDEPATH += $$PWD/../../app/scanner/
 INCLUDEPATH += $$PWD/../../../sdk/include/
 

build/linux/HGBase/HGBase.cbp

@@ -95,39 +95,39 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../base/HGBase.h" />
-		<Unit filename="../../../base/HGBase64.cpp" />
-		<Unit filename="../../../base/HGBase64.h" />
-		<Unit filename="../../../base/HGBaseErr.h" />
-		<Unit filename="../../../base/HGBuffer.cpp" />
-		<Unit filename="../../../base/HGBuffer.h" />
-		<Unit filename="../../../base/HGConsole.cpp" />
-		<Unit filename="../../../base/HGConsole.h" />
-		<Unit filename="../../../base/HGDef.h" />
-		<Unit filename="../../../base/HGDes.cpp" />
-		<Unit filename="../../../base/HGDes.h" />
-		<Unit filename="../../../base/HGDll.cpp" />
-		<Unit filename="../../../base/HGDll.h" />
-		<Unit filename="../../../base/HGEvent.cpp" />
-		<Unit filename="../../../base/HGEvent.h" />
-		<Unit filename="../../../base/HGImage.cpp" />
-		<Unit filename="../../../base/HGImage.h" />
-		<Unit filename="../../../base/HGInc.h" />
-		<Unit filename="../../../base/HGInfo.cpp" />
-		<Unit filename="../../../base/HGInfo.h" />
-		<Unit filename="../../../base/HGInfoImpl.cpp" />
-		<Unit filename="../../../base/HGInfoImpl.hpp" />
-		<Unit filename="../../../base/HGLock.cpp" />
-		<Unit filename="../../../base/HGLock.h" />
-		<Unit filename="../../../base/HGLog.cpp" />
-		<Unit filename="../../../base/HGLog.h" />
-		<Unit filename="../../../base/HGMd5.cpp" />
-		<Unit filename="../../../base/HGMd5.h" />
-		<Unit filename="../../../base/HGThread.cpp" />
-		<Unit filename="../../../base/HGThread.h" />
-		<Unit filename="../../../base/HGUtility.cpp" />
-		<Unit filename="../../../base/HGUtility.h" />
-		<Unit filename="../../../base/dllmain.cpp" />
+		<Unit filename="../../../modules/base/HGBase.h" />
+		<Unit filename="../../../modules/base/HGBase64.cpp" />
+		<Unit filename="../../../modules/base/HGBase64.h" />
+		<Unit filename="../../../modules/base/HGBaseErr.h" />
+		<Unit filename="../../../modules/base/HGBuffer.cpp" />
+		<Unit filename="../../../modules/base/HGBuffer.h" />
+		<Unit filename="../../../modules/base/HGConsole.cpp" />
+		<Unit filename="../../../modules/base/HGConsole.h" />
+		<Unit filename="../../../modules/base/HGDef.h" />
+		<Unit filename="../../../modules/base/HGDes.cpp" />
+		<Unit filename="../../../modules/base/HGDes.h" />
+		<Unit filename="../../../modules/base/HGDll.cpp" />
+		<Unit filename="../../../modules/base/HGDll.h" />
+		<Unit filename="../../../modules/base/HGEvent.cpp" />
+		<Unit filename="../../../modules/base/HGEvent.h" />
+		<Unit filename="../../../modules/base/HGImage.cpp" />
+		<Unit filename="../../../modules/base/HGImage.h" />
+		<Unit filename="../../../modules/base/HGInc.h" />
+		<Unit filename="../../../modules/base/HGInfo.cpp" />
+		<Unit filename="../../../modules/base/HGInfo.h" />
+		<Unit filename="../../../modules/base/HGInfoImpl.cpp" />
+		<Unit filename="../../../modules/base/HGInfoImpl.hpp" />
+		<Unit filename="../../../modules/base/HGLock.cpp" />
+		<Unit filename="../../../modules/base/HGLock.h" />
+		<Unit filename="../../../modules/base/HGLog.cpp" />
+		<Unit filename="../../../modules/base/HGLog.h" />
+		<Unit filename="../../../modules/base/HGMd5.cpp" />
+		<Unit filename="../../../modules/base/HGMd5.h" />
+		<Unit filename="../../../modules/base/HGThread.cpp" />
+		<Unit filename="../../../modules/base/HGThread.h" />
+		<Unit filename="../../../modules/base/HGUtility.cpp" />
+		<Unit filename="../../../modules/base/HGUtility.h" />
+		<Unit filename="../../../modules/base/dllmain.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />

build/linux/HGImgFmt/HGImgFmt.cbp

@@ -194,25 +194,25 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../imgfmt/HGBmp.cpp" />
-		<Unit filename="../../../imgfmt/HGBmp.h" />
-		<Unit filename="../../../imgfmt/HGImgFmt.cpp" />
-		<Unit filename="../../../imgfmt/HGImgFmt.h" />
-		<Unit filename="../../../imgfmt/HGImgFmtErr.h" />
-		<Unit filename="../../../imgfmt/HGJpeg.cpp" />
-		<Unit filename="../../../imgfmt/HGJpeg.h" />
-		<Unit filename="../../../imgfmt/HGOfd.cpp" />
-		<Unit filename="../../../imgfmt/HGOfd.h" />
-		<Unit filename="../../../imgfmt/HGOfdImpl.cpp" />
-		<Unit filename="../../../imgfmt/HGOfdImpl.hpp" />
-		<Unit filename="../../../imgfmt/HGPdf.cpp" />
-		<Unit filename="../../../imgfmt/HGPdf.h" />
-		<Unit filename="../../../imgfmt/HGPdfImpl.cpp" />
-		<Unit filename="../../../imgfmt/HGPdfImpl.hpp" />
-		<Unit filename="../../../imgfmt/HGPng.cpp" />
-		<Unit filename="../../../imgfmt/HGPng.h" />
-		<Unit filename="../../../imgfmt/HGTiff.cpp" />
-		<Unit filename="../../../imgfmt/HGTiff.h" />
+		<Unit filename="../../../modules/imgfmt/HGBmp.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGBmp.h" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmt.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmt.h" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmtErr.h" />
+		<Unit filename="../../../modules/imgfmt/HGJpeg.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGJpeg.h" />
+		<Unit filename="../../../modules/imgfmt/HGOfd.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGOfd.h" />
+		<Unit filename="../../../modules/imgfmt/HGOfdImpl.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGOfdImpl.hpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdf.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdf.h" />
+		<Unit filename="../../../modules/imgfmt/HGPdfImpl.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdfImpl.hpp" />
+		<Unit filename="../../../modules/imgfmt/HGPng.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPng.h" />
+		<Unit filename="../../../modules/imgfmt/HGTiff.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGTiff.h" />
 		<Unit filename="../../../utility/HGString.cpp" />
 		<Unit filename="../../../utility/HGString.h" />
 		<Extensions>

build/linux/HGImgProc/HGImgProc.cbp

@@ -161,29 +161,29 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../imgproc/HGImgProc.cpp" />
-		<Unit filename="../../../imgproc/HGImgProc.h" />
-		<Unit filename="../../../imgproc/HGImgProcErr.h" />
-		<Unit filename="../../../imgproc/HGOCR.cpp" />
-		<Unit filename="../../../imgproc/HGOCR.h" />
-		<Unit filename="../../../imgproc/HGOCRBase.cpp" />
-		<Unit filename="../../../imgproc/HGOCRBase.hpp" />
-		<Unit filename="../../../imgproc/HGOCRHanvon.cpp" />
-		<Unit filename="../../../imgproc/HGOCRHanvon.hpp" />
-		<Unit filename="../../../imgproc/HGOCRRetImpl.cpp" />
-		<Unit filename="../../../imgproc/HGOCRRetImpl.hpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApply.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApply.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAdjustColors.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAdjustColors.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAutoCrop.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAutoCrop.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDiscardBlank.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDiscardBlank.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDispersion.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDispersion.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageProcess_Public.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageProcess_Public.h" />
+		<Unit filename="../../../modules/imgproc/HGImgProc.cpp" />
+		<Unit filename="../../../modules/imgproc/HGImgProc.h" />
+		<Unit filename="../../../modules/imgproc/HGImgProcErr.h" />
+		<Unit filename="../../../modules/imgproc/HGOCR.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCR.h" />
+		<Unit filename="../../../modules/imgproc/HGOCRBase.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRBase.hpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRHanvon.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRHanvon.hpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRRetImpl.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRRetImpl.hpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApply.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApply.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAdjustColors.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAdjustColors.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAutoCrop.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAutoCrop.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDiscardBlank.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDiscardBlank.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDispersion.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDispersion.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageProcess_Public.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageProcess_Public.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />

build/linux/HGSaneUser/HGSaneUser.cbp

@@ -88,11 +88,11 @@
 			<Add option="-fvisibility=hidden" />
 			<Add directory="../../../third_party/sane" />
 		</Compiler>
-		<Unit filename="../../../sane_user/HGSane.cpp" />
-		<Unit filename="../../../sane_user/HGSane.h" />
-		<Unit filename="../../../sane_user/HGSaneErr.h" />
-		<Unit filename="../../../sane_user/HGSaneImpl.cpp" />
-		<Unit filename="../../../sane_user/HGSaneImpl.hpp" />
+		<Unit filename="../../../modules/sane_user/HGSane.cpp" />
+		<Unit filename="../../../modules/sane_user/HGSane.h" />
+		<Unit filename="../../../modules/sane_user/HGSaneErr.h" />
+		<Unit filename="../../../modules/sane_user/HGSaneImpl.cpp" />
+		<Unit filename="../../../modules/sane_user/HGSaneImpl.hpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />

build/linux/HGTest/main.cpp

@@ -1,8 +1,9 @@
 #include "stdio.h"
-#include "../../../base/HGBase.h"
-#include "../../../imgfmt/HGImgFmt.h"
-#include "../../../imgproc/HGImgProc.h"
-#include "../../../imgproc/HGOCR.h"
+#include "base/HGBase.h"
+#include "imgfmt/HGImgFmt.h"
+#include "imgproc/HGImgProc.h"
+#include "imgproc/HGOCR.h"
+#include "sane_user/HGSane.h"
 
 int main()
 {

build/windows/HGBase/HGBase.vcxproj

@@ -22,41 +22,41 @@
     <None Include="HGBase.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\base\dllmain.cpp" />
-    <ClCompile Include="..\..\..\base\HGBase64.cpp" />
-    <ClCompile Include="..\..\..\base\HGBuffer.cpp" />
-    <ClCompile Include="..\..\..\base\HGConsole.cpp" />
-    <ClCompile Include="..\..\..\base\HGDes.cpp" />
-    <ClCompile Include="..\..\..\base\HGDll.cpp" />
-    <ClCompile Include="..\..\..\base\HGEvent.cpp" />
-    <ClCompile Include="..\..\..\base\HGImage.cpp" />
-    <ClCompile Include="..\..\..\base\HGInfo.cpp" />
-    <ClCompile Include="..\..\..\base\HGInfoImpl.cpp" />
-    <ClCompile Include="..\..\..\base\HGLock.cpp" />
-    <ClCompile Include="..\..\..\base\HGLog.cpp" />
-    <ClCompile Include="..\..\..\base\HGMd5.cpp" />
-    <ClCompile Include="..\..\..\base\HGThread.cpp" />
-    <ClCompile Include="..\..\..\base\HGUtility.cpp" />
+    <ClCompile Include="..\..\..\modules\base\dllmain.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGBase64.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGBuffer.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGConsole.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGDes.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGDll.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGEvent.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGImage.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGInfo.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGInfoImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGLock.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGLog.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGMd5.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGThread.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGUtility.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\base\HGBase.h" />
-    <ClInclude Include="..\..\..\base\HGBase64.h" />
-    <ClInclude Include="..\..\..\base\HGBaseErr.h" />
-    <ClInclude Include="..\..\..\base\HGConsole.h" />
-    <ClInclude Include="..\..\..\base\HGInc.h" />
-    <ClInclude Include="..\..\..\base\HGBuffer.h" />
-    <ClInclude Include="..\..\..\base\HGDef.h" />
-    <ClInclude Include="..\..\..\base\HGDes.h" />
-    <ClInclude Include="..\..\..\base\HGDll.h" />
-    <ClInclude Include="..\..\..\base\HGEvent.h" />
-    <ClInclude Include="..\..\..\base\HGImage.h" />
-    <ClInclude Include="..\..\..\base\HGInfo.h" />
-    <ClInclude Include="..\..\..\base\HGInfoImpl.hpp" />
-    <ClInclude Include="..\..\..\base\HGLock.h" />
-    <ClInclude Include="..\..\..\base\HGLog.h" />
-    <ClInclude Include="..\..\..\base\HGMd5.h" />
-    <ClInclude Include="..\..\..\base\HGThread.h" />
-    <ClInclude Include="..\..\..\base\HGUtility.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBase.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBase64.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBaseErr.h" />
+    <ClInclude Include="..\..\..\modules\base\HGConsole.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInc.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBuffer.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDef.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDes.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDll.h" />
+    <ClInclude Include="..\..\..\modules\base\HGEvent.h" />
+    <ClInclude Include="..\..\..\modules\base\HGImage.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInfo.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInfoImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\base\HGLock.h" />
+    <ClInclude Include="..\..\..\modules\base\HGLog.h" />
+    <ClInclude Include="..\..\..\modules\base\HGMd5.h" />
+    <ClInclude Include="..\..\..\modules\base\HGThread.h" />
+    <ClInclude Include="..\..\..\modules\base\HGUtility.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -169,7 +169,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
 copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -220,7 +220,7 @@ copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comman
     <PostBuildEvent>
       <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
 copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

build/windows/HGImgFmt/HGImgFmt.vcxproj

@@ -22,28 +22,28 @@
     <None Include="HGImgFmt.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\imgfmt\HGBmp.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGImgFmt.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGJpeg.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGOfd.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGOfdImpl.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPdf.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPdfImpl.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPng.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGTiff.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGBmp.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGImgFmt.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGJpeg.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGOfd.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGOfdImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPdf.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPdfImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPng.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGTiff.cpp" />
     <ClCompile Include="..\..\..\utility\HGString.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\imgfmt\HGBmp.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGImgFmt.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGImgFmtErr.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGJpeg.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGOfd.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGOfdImpl.hpp" />
-    <ClInclude Include="..\..\..\imgfmt\HGPdf.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGPdfImpl.hpp" />
-    <ClInclude Include="..\..\..\imgfmt\HGPng.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGTiff.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGBmp.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGImgFmt.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGImgFmtErr.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGJpeg.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGOfd.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGOfdImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPdf.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPdfImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPng.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGTiff.h" />
     <ClInclude Include="..\..\..\utility\HGString.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -119,7 +119,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -142,7 +142,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -157,7 +157,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
 copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -170,7 +170,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
@@ -194,7 +194,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -209,7 +209,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
 copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

build/windows/HGImgProc/HGImgProc.vcxproj

@@ -19,31 +19,31 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\imgproc\HGImgProc.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCR.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRBase.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRHanvon.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRRetImpl.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApply.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyAdjustColors.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyAutoCrop.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyDiscardBlank.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyDispersion.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageProcess_Public.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGImgProc.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCR.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRBase.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRHanvon.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRRetImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApply.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAdjustColors.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAutoCrop.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDiscardBlank.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDispersion.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageProcess_Public.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\imgproc\HGImgProc.h" />
-    <ClInclude Include="..\..\..\imgproc\HGImgProcErr.h" />
-    <ClInclude Include="..\..\..\imgproc\HGOCR.h" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRBase.hpp" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRHanvon.hpp" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRRetImpl.hpp" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApply.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyAdjustColors.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyAutoCrop.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyDiscardBlank.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyDispersion.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageProcess_Public.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGImgProc.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGImgProcErr.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCR.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRBase.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRHanvon.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRRetImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApply.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAdjustColors.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAutoCrop.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDiscardBlank.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDispersion.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageProcess_Public.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HGImgProc.def" />
@@ -160,7 +160,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
 copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -212,7 +212,7 @@ copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Com
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
 copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

build/windows/HGSaneUser/HGSaneUser.vcxproj

@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\sane_user\HGSane.cpp" />
-    <ClCompile Include="..\..\..\sane_user\HGSaneImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\sane_user\HGSane.cpp" />
+    <ClCompile Include="..\..\..\modules\sane_user\HGSaneImpl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\sane_user\HGSane.h" />
-    <ClInclude Include="..\..\..\sane_user\HGSaneErr.h" />
-    <ClInclude Include="..\..\..\sane_user\HGSaneImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSane.h" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSaneErr.h" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSaneImpl.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HGSaneUser.def" />

build/windows/HGTest/HGTest.vcxproj

@@ -93,6 +93,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -115,6 +116,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -139,6 +141,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -166,6 +169,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

build/windows/HGTest/pch.cpp

@@ -8,24 +8,28 @@
 #ifdef _DEBUG
 #pragma comment(lib, "../x64/Debug/HGBase.lib")
 #pragma comment(lib, "../x64/Debug/HGImgFmt.lib")
-#pragma comment(lib, "../x64/Debug/HGTwainUser.lib")
 #pragma comment(lib, "../x64/Debug/HGImgProc.lib")
+#pragma comment(lib, "../x64/Debug/HGTwainUser.lib")
+#pragma comment(lib, "../x64/Debug/HGSaneUser.lib")
 #else
 #pragma comment(lib, "../x64/Release/HGBase.lib")
 #pragma comment(lib, "../x64/Release/HGImgFmt.lib")
-#pragma comment(lib, "../x64/Release/HGTwainUser.lib")
 #pragma comment(lib, "../x64/Release/HGImgProc.lib")
+#pragma comment(lib, "../x64/Release/HGTwainUser.lib")
+#pragma comment(lib, "../x64/Release/HGSaneUser.lib")
 #endif
 #else
 #ifdef _DEBUG
 #pragma comment(lib, "../Debug/HGBase.lib")
 #pragma comment(lib, "../Debug/HGImgFmt.lib")
-#pragma comment(lib, "../Debug/HGTwainUser.lib")
 #pragma comment(lib, "../Debug/HGImgProc.lib")
+#pragma comment(lib, "../Debug/HGTwainUser.lib")
+#pragma comment(lib, "../Debug/HGSaneUser.lib")
 #else
 #pragma comment(lib, "../Release/HGBase.lib")
 #pragma comment(lib, "../Release/HGImgFmt.lib")
-#pragma comment(lib, "../Release/HGTwainUser.lib")
 #pragma comment(lib, "../Release/HGImgProc.lib")
+#pragma comment(lib, "../Release/HGTwainUser.lib")
+#pragma comment(lib, "../Release/HGSaneUser.lib")
 #endif
 #endif

build/windows/HGTest/pch.h

@@ -10,16 +10,17 @@
 // 添加要在此处预编译的标头
 #include "framework.h"
 
-#include "../../../base/HGBase.h"
-#include "../../../imgfmt/HGJpeg.h"
-#include "../../../imgfmt/HGBmp.h"
-#include "../../../imgfmt/HGPng.h"
-#include "../../../imgfmt/HGTiff.h"
-#include "../../../imgfmt/HGPdf.h"
-#include "../../../imgfmt/HGOfd.h"
-#include "../../../imgfmt/HGImgFmt.h"
-#include "../../../twain_user/HGTwain.h"
-#include "../../../imgproc/HGImgProc.h"
-#include "../../../imgproc/HGOCR.h"
+#include "base/HGBase.h"
+#include "imgfmt/HGJpeg.h"
+#include "imgfmt/HGBmp.h"
+#include "imgfmt/HGPng.h"
+#include "imgfmt/HGTiff.h"
+#include "imgfmt/HGPdf.h"
+#include "imgfmt/HGOfd.h"
+#include "imgfmt/HGImgFmt.h"
+#include "imgproc/HGImgProc.h"
+#include "imgproc/HGOCR.h"
+#include "twain_user/HGTwain.h"
+#include "sane_user/HGSane.h"
 
 #endif //PCH_H

build/windows/HGTwainUser/HGTwainUser.vcxproj

@@ -22,14 +22,14 @@
     <None Include="HGTwainUser.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\twain_user\dllmain.cpp" />
-    <ClCompile Include="..\..\..\twain_user\HGTwain.cpp" />
-    <ClCompile Include="..\..\..\twain_user\HGTwainImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\dllmain.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\HGTwain.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\HGTwainImpl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\twain_user\HGTwain.h" />
-    <ClInclude Include="..\..\..\twain_user\HGTwainErr.h" />
-    <ClInclude Include="..\..\..\twain_user\HGTwainImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwain.h" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwainErr.h" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwainImpl.hpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>

build/windows/HGWebService/HGWebService.vcxproj

@@ -119,7 +119,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -137,7 +137,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -176,7 +176,7 @@
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

modules/imgfmt/HGOfdImpl.cpp

@@ -1,7 +1,7 @@
 #include "HGOfdImpl.hpp"
 #include "../base/HGInc.h"
 #include "../base/HGUtility.h"
-#include "../utility/HGString.h"
+#include "HGString.h"
 
 #define A4page_page_PhysicalBox_Width	210.000000
 #define A4page_page_PhysicalBox_Height	297.000000

modules/imgfmt/HGPdfImpl.cpp

@@ -1,7 +1,7 @@
 #include "HGPdfImpl.hpp"
 #include "../base/HGInc.h"
 #include "../base/HGUtility.h"
-#include "../utility/HGString.h"
+#include "HGString.h"
 #include <string>
 #include <iostream>