From 694fc5855f8df05ba9c0c7592b8213acf4ae121e Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 15 Jun 2023 08:59:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=89=B2=E5=81=8F?= =?UTF-8?q?=E6=A0=A1=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 2 +- hgdriver/hgdev/hg_scanner_239.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 3b0a16d..befdfc0 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2369,7 +2369,7 @@ int hg_scanner::setting_color_correction(void* data, long* len) } if (pid_ == 0x239 || pid_ == 0x439) { - if (is_kernelsnap_239_3C_) + if (!is_kernelsnap_239_3C_) { *((bool*)data) = color_correction_ = false; return SCANNER_ERR_DEVICE_NOT_SUPPORT; diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index b4a0bd5..60917af 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -503,9 +503,9 @@ void hg_scanner_239::init_version(void) //is_kernelsnap_439_3C0606 = date >= "C0606" ? true : false; is_kernelsnap_239_3C_ = date >= "C0606" ? true : false; VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO \ - , "is_kernelsnap_439_3C0606:%d \ + , "is_kernelsnap_239_3C_:%d \ , is_kernelsnap_439_220430_:%d\r\n" \ - , is_kernelsnap_439_3C0606 \ + , is_kernelsnap_239_3C_ \ , is_kernelsnap_439_220430_); } From bef5b4f2e720520da41af81471b9b139dfc2bcd8 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 15 Jun 2023 09:43:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/image_process.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 451df61..8400ee6 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -511,7 +511,7 @@ namespace hg_imgproc rmc = cv::IMREAD_COLOR; } cv::Mat mat(cv::imdecode(*buf, rmc)); - cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\imdecode.jpg",mat); + //cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\imdecode.jpg",mat); if (mat.empty()) { @@ -525,7 +525,7 @@ namespace hg_imgproc else if (pid == 0x100 || pid == 0x200 || pid == 0x139 || pid == 0x239 || pid_ == 0x439) { Temp_mat.push_back(mat); - cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\decode1.jpg",mat); + //cv::imwrite("C:\\Users\\modehua\\Desktop\\image\\decode1.jpg",mat); } else if (pid == 0x300 || pid == 0x400 || pid == 0x402 || pid == 0x302) {