From f30f227860ed3376ffd0c6697ca5068245e933ee Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 1 Dec 2023 14:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3300=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=9C=9F=E5=AE=9E600dpi=E5=9B=BA=E5=AE=9A=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=9B=BE=E5=83=8F=E4=B8=8D=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner_300.cpp |  1 -
 hgdriver/hgdev/image_process.cpp  | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

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;