From ff3a782f4e788606a759897b1d98b3b2b9834c68 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 23 Nov 2023 11:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8E=BB=E9=99=A4=E6=91=A9?=
 =?UTF-8?q?=E5=B0=94=E7=BA=B9=EF=BC=8C300dpi=E5=8F=8A=E4=BB=A5=E4=B8=8A?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?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.cpp     | 6 ------
 hgdriver/hgdev/hg_scanner_300.cpp | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index 4b340ee..3087102 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -2301,12 +2301,6 @@ int hg_scanner::setting_is_permeate_lv(void* data, long* len)
 }
 int hg_scanner::setting_remove_morr(void* data, long* len)
 {
-	if (resolution_ > 300 )
-	{
-		image_prc_param_.bits.remove_txtture = image_prc_param_.bits.remove_morr = *((bool*)data) = false;
-		return SCANNER_ERR_DEVICE_NOT_SUPPORT;
-	}
-	
 	image_prc_param_.bits.remove_morr = *((bool*)data);
 	return SCANNER_ERR_OK;
 }
diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp
index 4047bcd..de1ef1d 100644
--- a/hgdriver/hgdev/hg_scanner_300.cpp
+++ b/hgdriver/hgdev/hg_scanner_300.cpp
@@ -609,7 +609,7 @@ int hg_scanner_300::writedown_device_configuration(bool type,setting_hardware::H
 		VLOG_MINI_1(LOG_LEVEL_WARNING, "writedown_device_configuration is_quality_ is .(%d)\n", is_quality_)
 		d->params_3288.dpi = 1;
 	}
-	if (image_prc_param_.bits.remove_morr && firmware_sup_morr_)
+	if (image_prc_param_.bits.remove_morr && firmware_sup_morr_ && resolution_ < 500)
 	{
 		d->params_3288.moire = true;
 	}