解决300设备真实600dpi固定尺寸扫描图像不完整的问题

This commit is contained in:
yangjiaxuan 2023-12-01 14:55:30 +08:00
parent 3d865fa895
commit f30f227860
2 changed files with 4 additions and 8 deletions

View File

@ -738,7 +738,6 @@ int hg_scanner_300::set_kernelsnap_ver()
firmware_sup_dpi_300 = true;
else if (atoi(fw.substr(4, 6).c_str()) >= 230210)
{
firmware_sup_dpi_300 = true;
firmware_sup_dpi_600 = true;
}
else

View File

@ -433,18 +433,15 @@ namespace hg_imgproc
float scale = img_conf_.fillhole.fillholeratio / 100.0;
int dpi = img_conf_.resolution_dst;
if (!param_.is_sup_real_300dpi_)
if (!param_.is_sup_real_300dpi_ && !param_.is_sup_real_600dpi_)
{
dpi = 200;
}
else
{
if (!param_.is_sup_real_600dpi_)
else if (param_.is_sup_real_300dpi_ && !param_.is_sup_real_600dpi_)
{
if (dpi >= 300)
dpi = 300;
}
}
float val = dpi / 10;
cv::Vec4f edgeScale;