diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 43831e7..b9620c1 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -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 diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 6a7662a..0aa3513 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -433,17 +433,14 @@ 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 + 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;