From ac64e93cf53208a59b3e07d14a796304f15141d0 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Fri, 13 Jan 2023 14:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=9A=E6=B5=81=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E5=B4=A9=E6=BA=83=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 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 995c2f7..1b036ba 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -970,7 +970,7 @@ void hg_scanner::thread_handle_image_process(void) else stop_fatal_ = SCANNER_ERR_INSUFFICIENT_MEMORY; VLOG_MINI_1(LOG_LEVEL_ALL, "is opencv Fatal: %s\n", e.what()); - stop(); + //stop(); break; } @@ -1573,10 +1573,10 @@ int hg_scanner::setting_resolution(void* data) // check paper ... if (!check_paper_and_resolution(resolution_, image_prc_param_.bits.paper)) { - //resolution_ = old; - //*((int*)data) = old; + resolution_ = old; + *((int*)data) = old; - return SCANNER_ERR_DEVICE_NOT_SUPPORT; + return SCANNER_ERR_NOT_EXACT; } /*if (!check_resolution_and_quality(resolution_, is_img_quality(is_quality_).c_str())) { @@ -2665,7 +2665,7 @@ int hg_scanner::save_final_image(hg_imgproc::LPIMGHEAD head, void* buf) is_1bit = true; } - if (image_prc_param_.bits.color_mode == COLOR_MODE_BLACK_WHITE || (is_1bit && is_multiout)) + if ((image_prc_param_.bits.color_mode == COLOR_MODE_BLACK_WHITE && !is_multiout) || (is_1bit && is_multiout)) { int old = head->line_bytes; /*/ @@ -3726,7 +3726,8 @@ void hg_scanner::image_process(std::shared_ptr& buffer) if (pid_ != 0x239 && pid_ != 0x439) { - float dpi3288 = (img_conf_.resolution_dst < 300 && is_kernelsnap3288_221106_) ? 200 : 300; + float dpi3288 = (img_conf_.resolution_dst > 300 && is_kernelsnap3288_221106_) ? 300 : 200; + ret = hg_imgproc::auto_crop(ImagePrc_pHandle_, dpi3288); (this->*dump_img_)(ImagePrc_pHandle_, "auto_crop"); } @@ -3744,10 +3745,10 @@ void hg_scanner::image_process(std::shared_ptr& buffer) (this->*dump_img_)(ImagePrc_pHandle_, "fadeback"); } - if (((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ != 0x239 && pid_ != 0x439) && !is_kernelsnap3288_221106_) - || (is_kernelsnap3288_221106_ && img_conf_.resolution_dst > 200)) + if (((img_conf_.resolution_dst != img_conf_.resolution_native) && (pid_ == 0x300 || pid_ == 0x0400) && !is_kernelsnap3288_221106_) + || (is_kernelsnap3288_221106_ && (img_conf_.resolution_dst != 200 && img_conf_.resolution_dst != 300))) { - float dpi3288 = (img_conf_.resolution_dst < 300 && is_kernelsnap3288_221106_) ? 200 : 300; + float dpi3288 = (img_conf_.resolution_dst > 300 && is_kernelsnap3288_221106_) ? 300 : 200; hg_imgproc::resolution_change(ImagePrc_pHandle_, dpi3288); (this->*dump_img_)(ImagePrc_pHandle_, "resolution_change"); @@ -3853,7 +3854,7 @@ void hg_scanner::image_process(std::shared_ptr& buffer) (this->*dump_img_)(ImagePrc_pHandle_, "split"); } - if (!img_conf_.splitImage || !img_conf_.multi_output_red || !is_multiout) //239 + if (!img_conf_.splitImage && !img_conf_.multi_output_red && !is_multiout) //239 { if (img_conf_.automaticcolor) {