From 57814455dc5b300d3627a986a543730d3e0fa395 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 10 Nov 2023 14:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E6=A3=80=E6=B5=8B=E7=9A=84=E7=BA=B8=E5=BC=A0?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E6=97=B6=EF=BC=8C=E5=9B=BA=E4=BB=B6=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E4=B8=8A=E4=B8=BB=E5=8A=A8=E5=B0=86=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=AE=BE=E4=B8=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp     | 11 +++++++++++
 hgdriver/hgdev/hg_scanner_239.cpp | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index 98f5fbd..f7effaf 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -5661,6 +5661,17 @@ int hg_scanner::image_configuration(SCANCONF& ic)
 	{
 		ic.cropRect.enable = false;
 	}
+	if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE
+		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
+		|| image_prc_param_.bits.paper == PAPER_TRIGEMINY
+		|| image_prc_param_.bits.paper == PAPER_16K
+		|| image_prc_param_.bits.paper == PAPER_8K
+		|| image_prc_param_.bits.paper == PAPER_16K_LATERAL
+		)
+	{
+		ic.en_sizecheck = false;
+	}
 	img_conf_ = ic;
 	VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "ic.pixtype=%d\r\n", ic.pixtype);
 	VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "ic.papertype=%d\r\n", ic.papertype);
diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp
index 8bbe65b..4ea6e82 100644
--- a/hgdriver/hgdev/hg_scanner_239.cpp
+++ b/hgdriver/hgdev/hg_scanner_239.cpp
@@ -667,17 +667,6 @@ int  hg_scanner_239::writedown_image_configuration(void)
 	ic.contrast = (contrast_ - 4) * 333.0;
 	ic.brightness = (bright_ - 128) * (2000.0 / 254.0);
 
-	if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
-		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE
-		|| image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
-		|| image_prc_param_.bits.paper == PAPER_TRIGEMINY
-		|| image_prc_param_.bits.paper == PAPER_16K
-		|| image_prc_param_.bits.paper == PAPER_8K
-		|| image_prc_param_.bits.paper == PAPER_16K_LATERAL
-		)
-	{
-		ic.en_sizecheck = false;
-	}
 
 	image_configuration(ic);