更新算法

This commit is contained in:
gb 2022-07-30 16:49:00 +08:00
parent dfbfe47d0f
commit d68ed41678
5 changed files with 42 additions and 18 deletions

View File

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,1032,2022,7281 FILEVERSION 4,1033,2022,7301
PRODUCTVERSION 4,1032,2022,7281 PRODUCTVERSION 4,1033,2022,7301
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司" VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序" VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.1032.2022.7281" VALUE "FileVersion", "4.1033.2022.7301"
VALUE "InternalName", "scanner.dll" VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "scanner.dll" VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan" VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.1032.2022.7281" VALUE "ProductVersion", "4.1033.2022.7301"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -73,14 +73,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)</IncludePath> <IncludePath>$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)</LibraryPath> <LibraryPath>$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\code_device\hgdriver\ImageProcess\lib\$(Configuration);$(LibraryPath)</LibraryPath>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir> <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)</IncludePath> <IncludePath>$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)</LibraryPath> <LibraryPath>$(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\code_device\hgdriver\ImageProcess\lib\$(Configuration);$(LibraryPath)</LibraryPath>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir> <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
</PropertyGroup> </PropertyGroup>
@ -102,7 +102,7 @@
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DIRECT_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -111,7 +111,7 @@
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib</AdditionalDependencies> <AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zbar.lib;zxing.lib;zlib.lib;user32.lib</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile> <ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile>
@ -134,7 +134,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DIRECT_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
@ -144,7 +144,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib</AdditionalDependencies> <AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zbar.lib;zxing.lib;zlib.lib;user32.lib</AdditionalDependencies>
<ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile> <ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile>
<IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries>
@ -230,7 +230,10 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_manager.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_manager.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDispersion.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyMarkCrop.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySizeDetection.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySizeDetection.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\wrapper\hg_log.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\wrapper\hg_log.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.cpp" />
@ -305,11 +308,13 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyCvtColor.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyCvtColor.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDetachNoise.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDetachNoise.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDiscardBlank.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDiscardBlank.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDispersion.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDogEarDetection.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDogEarDetection.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyFadeBackGroundColor.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyFadeBackGroundColor.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyFilter.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyFilter.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyHeaders.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyHeaders.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyHSVCorrect.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyHSVCorrect.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyMarkCrop.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyOutHole.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyOutHole.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyRefuseInflow.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyRefuseInflow.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyResize.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyResize.h" />
@ -319,6 +324,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySplit.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySplit.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyTextureRemoval.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyTextureRemoval.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUV.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUV.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageMulti.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageMulti.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageMultiOutputRed.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageMultiOutputRed.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.h" />

View File

@ -186,6 +186,15 @@
<ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_402.cpp"> <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_402.cpp">
<Filter>dev</Filter> <Filter>dev</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDispersion.cpp">
<Filter>image</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyMarkCrop.cpp">
<Filter>image</Filter>
</ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.cpp">
<Filter>image</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h"> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@ -398,6 +407,15 @@
<ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_402.h"> <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_402.h">
<Filter>dev</Filter> <Filter>dev</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyDispersion.h">
<Filter>image</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyMarkCrop.h">
<Filter>image</Filter>
</ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.h">
<Filter>image</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="device.def"> <None Include="device.def">

View File

@ -248,8 +248,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,1032,2022,7281 FILEVERSION 4,1033,2022,7301
PRODUCTVERSION 4,1032,2022,7281 PRODUCTVERSION 4,1033,2022,7301
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -266,12 +266,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司" VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序" VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.1032.2022.7281" VALUE "FileVersion", "4.1033.2022.7301"
VALUE "InternalName", "sane.dll" VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "sane.dll" VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan" VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.1032.2022.7281" VALUE "ProductVersion", "4.1033.2022.7301"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -49,7 +49,7 @@
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir> <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
<LibraryPath>$(LibraryPath)</LibraryPath> <LibraryPath>$(LibraryPath)</LibraryPath>
<TargetName>huagaotwain402.ds</TargetName> <TargetName>huagaotwain239.ds</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
@ -57,14 +57,14 @@
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir> <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
<LibraryPath>$(LibraryPath)</LibraryPath> <LibraryPath>$(LibraryPath)</LibraryPath>
<TargetName>huagaotwain402.ds</TargetName> <TargetName>huagaotwain239.ds</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;HGSCANNER_EXPORT;CUSTOM_USBVIEW;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@ -94,7 +94,7 @@ copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y</Command
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;HGSCANNER_EXPORT;CUSTOM_USBVIEW;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>