From 0e84507cddde98c2ee44c0a91c55fbd36f7d11f4 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Sat, 26 Aug 2023 15:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=A4=9A=E6=B5=81?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=81=B0=E5=BA=A6=E9=BB=91=E7=99=BD=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E5=9B=BE=E5=83=8F=E5=90=8E=EF=BC=8C=E5=BD=A9=E8=89=B2?= =?UTF-8?q?=E5=9B=BE=E5=83=8F=E5=8F=98=E6=88=90=E7=81=B0=E5=BA=A6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_200.cpp | 3 +++ hgdriver/hgdev/hg_scanner_239.cpp | 3 ++- hgdriver/hgdev/hg_scanner_302.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index 3fd8641..be2a69a 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -463,9 +463,12 @@ int hg_scanner_200::writedown_device_configuration(bool type,setting_hardware::H int ret = SCANNER_ERR_OK, len = 0; + + setting_hardware::HGSCANCONF_DSP p = dsp_config_; //不得改变外部的值 if (!d) d = &dsp_config_; + if (is_multiout) { d->params_dsp.color = image_prc_param_.bits.multi_out == MULTI_GRAY_AND_BW ? 0 : 1; diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index dda38e8..1d364cf 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -525,8 +525,9 @@ int hg_scanner_239::writedown_device_configuration(bool type, setting_hardware: int ret = SCANNER_ERR_OK; if (!type) return ret; + setting_hardware::HGSCANCONF_3399 p = dev_conf_; //不得改变外部的值 if (!dev_conf) - dev_conf = &dev_conf_; + dev_conf = &p; if (is_multiout) { diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 71bf6b3..17891d4 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -452,11 +452,11 @@ int hg_scanner_302::writedown_device_configuration(bool type,setting_hardware::H int ret = SCANNER_ERR_OK; if (!type) return ret; + + setting_hardware::HGSCANCONF_3399 p = dev_conf_; //不得改变外部的值 if (!dev_conf) - { - dev_conf_.params_3399.is_textcorrect = !keep_watermark_; - dev_conf = &dev_conf_; - } + dev_conf = &p; + if (is_multiout) { dev_conf->params_3399.color = image_prc_param_.bits.multi_out == MULTI_GRAY_AND_BW ? 0 : 1;