From ec7695cb57967a8943ca520a42722eebbd8a4f3c Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Sun, 25 Jun 2023 10:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E7=BD=91=E6=96=87=E5=92=8C=E6=91=A9?= =?UTF-8?q?=E5=B0=94=E7=BA=B9=E4=BD=BF=E7=94=A8=E5=8F=8C=E8=BE=B9=E6=BB=A4?= =?UTF-8?q?=E6=B3=A2=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 58646ca..07681a2 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2804,28 +2804,28 @@ void hg_scanner::change_setting_language(bool init) change_string_2_lang_id(v.c_str(), "desc"); setting_jsn_.at(v.c_str()).at("type").get_to(val); - if (v.compare(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)) == 0) - { - int val = 0; - get_sleep_time(val); - const char* p_time = NULL; - if (val == -1 || val > 20000) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_BXM); // changed in 'if (val == "string")' branch. - else if (val > 0 && val <= 300) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_WFZ); - else if (val > 300 && val <= 600) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_SFZ); - else if (val > 600 && val <= 1800) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_BXS); - else if (val > 1800 && val <= 3600) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_YXS); - else if (val > 3600 && val <= 7200) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_LXS); - else if (val > 7200 && val <= 14400) - p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_SXS); - if (p_time) - setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_time; - } + //if (v.compare(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)) == 0) + //{ + // int val = 0; + // get_sleep_time(val); + // const char* p_time = NULL; + // if (val == -1 || val > 20000) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_BXM); // changed in 'if (val == "string")' branch. + // else if (val > 0 && val <= 300) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_WFZ); + // else if (val > 300 && val <= 600) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_SFZ); + // else if (val > 600 && val <= 1800) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_BXS); + // else if (val > 1800 && val <= 3600) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_YXS); + // else if (val > 3600 && val <= 7200) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_LXS); + // else if (val > 7200 && val <= 14400) + // p_time = /*from_default_language*/(OPTION_VALUE_XMSJ_SXS); + // if (p_time) + // setting_jsn_.at(from_default_language(SANE_STD_OPT_NAME_TIME_TO_SLEEP)).at("default") = p_time; + //} if (v.compare(from_default_language(SANE_STD_OPT_NAME_FEED_STRENGTH)) == 0) { int val = 0; @@ -4564,7 +4564,8 @@ void hg_scanner::image_process(std::shared_ptr& buffer, uint32_t id if ((img_conf_.textureRemove) && (pid_ != 0x239 && pid_ != 0x439)) { - hg_imgproc::textureRemove(ImagePrc_pHandle_); + //hg_imgproc::textureRemove(ImagePrc_pHandle_); + hg_imgproc::remove_morr(ImagePrc_pHandle_); (this->*dump_img_)(ImagePrc_pHandle_, "textureRemove"); }