From c0a759582717e4f2bbd1430f31c77b3ab9c98b00 Mon Sep 17 00:00:00 2001
From: masayume <1936714878@qq.com>
Date: Mon, 28 Nov 2022 16:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BF=87=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E9=A1=B5=E9=A6=96=E9=80=89=E9=A1=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                   | 5 ++++-
 huagao/Device/GScanO1003399.cpp | 4 ----
 huagao/GscanJsonConfig.cpp      | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 71c00078..75a9625a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -75,4 +75,7 @@
 	1.添加设置锁定接口 -- 22.11.01
 2022年11月6日 pm
 	1. 针对G300 3288 版本 增加200 300真实DPI；
-	2. 开放速度优先以及画质优先模式；
\ No newline at end of file
+	2. 开放速度优先以及画质优先模式；
+2022年11月28日 jzq
+	1.修复单面扫描 拆分 多流除红 出图不一致问题 -- 22.11.28
+	2.修复跳过空白页首选项配置保存问题 -- 22.11.28
\ No newline at end of file
diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp
index 23a21c91..6759f8c8 100644
--- a/huagao/Device/GScanO1003399.cpp
+++ b/huagao/Device/GScanO1003399.cpp
@@ -963,10 +963,6 @@ void GScanO1003399::imgproce(std::shared_ptr<std::vector<char>>& buff)
 				cv::Mat ret = m_mlt.GetMultiFilterMat(mats[i], 2);
 				mats[i].release();
 				if (!ret.empty()) {
-					if (!m_param.is_duplex && i == 1) {
-						ret.release();
-						break;
-					}
 					Mat2Bmp mb(ret, m_param.resolution_dst);
 					m_imagedata.Put(mb.getBmpDataBuffer());
 					ret.release();
diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp
index bd25c5cf..2397f2f3 100644
--- a/huagao/GscanJsonConfig.cpp
+++ b/huagao/GscanJsonConfig.cpp
@@ -102,6 +102,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin
 	outJson["Config"].Add(DUPLEX, (bool)(gcap.is_duplex),false);
 	outJson["Config"].Add(DISCARBLANK, (bool)(gcap.is_autodiscradblank_normal), false);
 	outJson["Config"].Add(DISCARBLANKVINCE, (bool)(gcap.is_autodiscradblank_vince), false);
+	outJson["Config"].Add(DISCARBLANK_VALUE, (int)gcap.discardblank_percent);
 	//outJson["Config"].Add(DB_AREANUM, (int)(pConfigItem->DBlank_AreaNum));
 	//outJson["Config"].Add(DB_DEVNMAX, (int)(pConfigItem->DBlank_DevnMax));
 	outJson["Config"].Add(FLOD, (bool)(gcap.en_fold), false);
@@ -115,7 +116,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin
 	outJson["Config"].Add(AUTOCONTRAST, (bool)(gcap.is_autocontrast), false);
 	outJson["Config"].Add(CONTRAST, (double)(gcap.contrast));
 	outJson["Config"].Add(GAMMA_, (double)(gcap.gamma));
-
+	
 	outJson["Config"].Add(FILTERTYPE, (int)(gcap.filter));
 	outJson["Config"].Add(ENHANCECOLOR,((int)gcap.enhance_color));
 	outJson["Config"].Add(SHARPENTYPE, (int)(gcap.sharpen));