调整不支持匹配原始尺寸

This commit is contained in:
13038267101 2023-11-21 15:21:22 +08:00
parent 2f87ca5106
commit 836d5a3cc7
2 changed files with 10 additions and 6 deletions

View File

@ -20,7 +20,7 @@ HG_SCANPARAMS m_params;
std::string img_type_ = ".jpg"; std::string img_type_ = ".jpg";
void* m_obj_usb = nullptr; void* m_obj_usb = nullptr;
void* m_obj_img = nullptr; void* m_obj_img = nullptr;
static const char* SDKVersion = "4.39.03.02"; static const char* SDKVersion = "4.52.11.21";
char deviceList[60]; char deviceList[60];
unsigned int compression_data = 80; unsigned int compression_data = 80;
HG_OnDevice_Event_Callback m_callback_OnDevcie_Event = nullptr; HG_OnDevice_Event_Callback m_callback_OnDevcie_Event = nullptr;
@ -668,7 +668,11 @@ int SetDeviceParam(HG_Scanner_Handle pScanner)
enumValue = HGLIB_OPTION_ENUMVALUE_ZZCC_ZDSMCC; enumValue = HGLIB_OPTION_ENUMVALUE_ZZCC_ZDSMCC;
HGLib_SetDeviceParam((HGLibDevice)pScanner, HGLIB_OPTION_NAME_ZZCC, &enumValue); HGLib_SetDeviceParam((HGLibDevice)pScanner, HGLIB_OPTION_NAME_ZZCC, &enumValue);
} }
else if (m_params.PaperSize == HG_None)
{
enumValue = HGLIB_OPTION_ENUMVALUE_ZZCC_PPYSCC;
HGLib_SetDeviceParam((HGLibDevice)pScanner, HGLIB_OPTION_NAME_ZZCC, &enumValue);
}
if (m_params.ScanSide.DiscardBlank == 1) if (m_params.ScanSide.DiscardBlank == 1)
{ {
enumValue = HGLIB_OPTION_ENUMVALUE_SMYM_TGKBYTY; enumValue = HGLIB_OPTION_ENUMVALUE_SMYM_TGKBYTY;

View File

@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">