From 04f183c2d649cc7263256c9a9072952e4d200385 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Fri, 7 Jul 2023 18:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B490=E5=BA=A6=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=20=E5=AF=B9=E6=8A=98=E6=8B=86=E5=88=86=E4=BA=92=E6=96=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp    | 5 +++++
 hgdriver/hgdev/image_process.cpp | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index dceeb01..1cb3a03 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -4877,6 +4877,11 @@ int hg_scanner::image_configuration(SCANCONF& ic)
 	ic.fold_concatmode = fold_type_;
 	ic.HsvFilterType = 0;//暂定为0
 	ic.is_colorcast = color_correction_;
+	if (ic.en_fold)
+	{
+		ic.splitImage = false;
+	}
+
 	//多流输出优先级最高
 	if (is_multiout)
 	{
diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp
index 67df4d3..2a62779 100644
--- a/hgdriver/hgdev/image_process.cpp
+++ b/hgdriver/hgdev/image_process.cpp
@@ -946,6 +946,13 @@ namespace hg_imgproc
 
 			Rotation.apply(mats,img_conf_.is_duplex);
 			mats_ = mats;
+			if (mats_.size() % 2 == 0 
+				&& ((CImageApplyRotation::RotationType)img_conf_.imageRotateDegree == CImageApplyRotation::RotationType::Rotate_90_clockwise
+				|| (CImageApplyRotation::RotationType)img_conf_.imageRotateDegree == CImageApplyRotation::RotationType::Rotate_90_anti_clockwise))
+			{
+				cv::flip(mats_[1], mats_[1],0);
+				cv::flip(mats_[1], mats_[1], 1);
+			}
 			
 			if (mats_.empty())
 			{