解决300设备真实600dpi固定尺寸扫描图像不完整的问题
This commit is contained in:
parent
3d865fa895
commit
f30f227860
|
@ -738,7 +738,6 @@ int hg_scanner_300::set_kernelsnap_ver()
|
||||||
firmware_sup_dpi_300 = true;
|
firmware_sup_dpi_300 = true;
|
||||||
else if (atoi(fw.substr(4, 6).c_str()) >= 230210)
|
else if (atoi(fw.substr(4, 6).c_str()) >= 230210)
|
||||||
{
|
{
|
||||||
firmware_sup_dpi_300 = true;
|
|
||||||
firmware_sup_dpi_600 = true;
|
firmware_sup_dpi_600 = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -433,17 +433,14 @@ namespace hg_imgproc
|
||||||
float scale = img_conf_.fillhole.fillholeratio / 100.0;
|
float scale = img_conf_.fillhole.fillholeratio / 100.0;
|
||||||
int dpi = img_conf_.resolution_dst;
|
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;
|
dpi = 200;
|
||||||
}
|
}
|
||||||
else
|
else if (param_.is_sup_real_300dpi_ && !param_.is_sup_real_600dpi_)
|
||||||
{
|
{
|
||||||
if (!param_.is_sup_real_600dpi_)
|
if (dpi >= 300)
|
||||||
{
|
dpi = 300;
|
||||||
if (dpi >= 300)
|
|
||||||
dpi = 300;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float val = dpi / 10;
|
float val = dpi / 10;
|
||||||
|
|
Loading…
Reference in New Issue