diff --git a/sdk/oldwebscan/demo/C++TestDemo/sln/testdemo.vcxproj b/sdk/oldwebscan/demo/C++TestDemo/sln/testdemo.vcxproj index ac3c9652..29a96b25 100644 --- a/sdk/oldwebscan/demo/C++TestDemo/sln/testdemo.vcxproj +++ b/sdk/oldwebscan/demo/C++TestDemo/sln/testdemo.vcxproj @@ -28,12 +28,12 @@ Application true - v143 + v142 Application false - v143 + v142 Application diff --git a/sdk/oldwebscan/hgscannersdk/HG_SCANNER_API.cpp b/sdk/oldwebscan/hgscannersdk/HG_SCANNER_API.cpp index dcc3e737..728c3220 100644 --- a/sdk/oldwebscan/hgscannersdk/HG_SCANNER_API.cpp +++ b/sdk/oldwebscan/hgscannersdk/HG_SCANNER_API.cpp @@ -238,6 +238,7 @@ void HG_CloseScanner(HG_Scanner_Handle pScanner) } int GetDeviceParam(HG_Scanner_Handle pScanner) { + HGBool is_MultiOutput = false; HGUInt count = 0; HGLibDeviceParamGroup* group = HGLib_GetDeviceParamGroupList((HGLibDevice)pScanner, &count); if (NULL == group) @@ -260,18 +261,28 @@ int GetDeviceParam(HG_Scanner_Handle pScanner) else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_YSMS_HB) m_params.PixelType = HG_BlackWhite; } + else if (devParam->option == HGLIB_OPTION_NAME_DLSC && devParam->type == HGLIB_OPTION_VALUETYPE_BOOL) + { + is_MultiOutput = devParam->boolValue; + } else if (devParam->option == HGLIB_OPTION_NAME_DLSCLX && devParam->type == HGLIB_OPTION_VALUETYPE_ENUM) { - if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_W) + if (is_MultiOutput) + { + if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD_HB) + m_params.MultiOutput = HG_All; + else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD) + m_params.MultiOutput = HG_ColorGray; + else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HB) + m_params.MultiOutput = HG_ColorBw; + else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_HD_HB) + m_params.MultiOutput = HG_GrayBw; + } + else + { m_params.MultiOutput = HG_Unused; - else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD_HB) - m_params.MultiOutput = HG_All; - else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HD) - m_params.MultiOutput = HG_ColorGray; - else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_CS_HB) - m_params.MultiOutput = HG_ColorBw; - else if (devParam->enumValue == HGLIB_OPTION_ENUMVALUE_DLSCLX_HD_HB) - m_params.MultiOutput = HG_GrayBw; + } + is_MultiOutput = false; } else if (devParam->option == HGLIB_OPTION_NAME_HDHHBTX_CS && devParam->type == HGLIB_OPTION_VALUETYPE_ENUM) { diff --git a/sdk/oldwebscan/sln/hgscannersdk/hgscannersdk.vcxproj b/sdk/oldwebscan/sln/hgscannersdk/hgscannersdk.vcxproj index ec91d4ea..ef1555ad 100644 --- a/sdk/oldwebscan/sln/hgscannersdk/hgscannersdk.vcxproj +++ b/sdk/oldwebscan/sln/hgscannersdk/hgscannersdk.vcxproj @@ -28,12 +28,12 @@ DynamicLibrary true - v143 + v142 DynamicLibrary false - v143 + v142 Application