From e06247e28cd1d3e608e0005d128afb53fbf40639 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Mon, 19 Sep 2022 16:23:36 +0800 Subject: [PATCH] =?UTF-8?q?G200=E9=80=82=E9=85=8D=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_200.cpp | 2 +- hgdriver/hgdev/hg_scanner_402.cpp | 2 +- hgdriver/hgdev/image_process.cpp | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index 0ba6f5f..72f19eb 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -665,7 +665,7 @@ void hg_scanner_200::image_process(std::shared_ptr& buffer) if(img_conf_.filter == RID_COLOR_NONE) colormode=img_conf_.pixtype; - err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0); + err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,0,true); VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "img split-> multiOutput is:%d splitImage is:%d multi_output_red is:%d pixtype is:%d is_duplex:%d\r\n" ,img_conf_.multiOutput ,img_conf_.splitImage diff --git a/hgdriver/hgdev/hg_scanner_402.cpp b/hgdriver/hgdev/hg_scanner_402.cpp index 5e77ce5..06131f0 100644 --- a/hgdriver/hgdev/hg_scanner_402.cpp +++ b/hgdriver/hgdev/hg_scanner_402.cpp @@ -812,7 +812,7 @@ void hg_scanner_402::image_process(std::shared_ptr& buff) int colormode=1; if(img_conf_.filter == RID_COLOR_NONE) colormode=img_conf_.pixtype; - err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,-1,is_kernelsnap_211209_); + err = hg_imgproc::split(handle,img_conf_.multiOutput,img_conf_.splitImage,img_conf_.multi_output_red,colormode,img_conf_.is_duplex,-1,true); VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "img split-> multiOutput is:%d splitImage is:%d multi_output_red is:%d pixtype is:%d is_duplex:%d\r\n" ,img_conf_.multiOutput ,img_conf_.splitImage diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index bc250cc..7537cdf 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -351,9 +351,19 @@ namespace hg_imgproc mats_.push_back(matex.mat); i++; } - if(fpga_ver || pid_ == 0x402) + if(fpga_ver) { - CImageApplyRotation Rotation(CImageApplyRotation::RotationType::Rotate_90_clockwise,img_conf_.is_backrotate180,img_conf_.resolution_native,"./tessdata"); + CImageApplyRotation::RotationType rotatetype = CImageApplyRotation::RotationType::Invalid; + switch (pid_) + { + case 0x100: + rotatetype = CImageApplyRotation::RotationType::Rotate_90_anti_clockwise; + break; + case 0x402: + rotatetype = CImageApplyRotation::RotationType::Rotate_90_clockwise; + break; + } + CImageApplyRotation Rotation(rotatetype,img_conf_.is_backrotate180,img_conf_.resolution_native,"./tessdata"); Rotation.apply(mats_,img_conf_.is_duplex); }