From 65acfab58425f9709dd746c65ebc2531f77b6e53 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 2 Jun 2023 11:10:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D302=E6=97=A0=E7=BA=B8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E8=BE=93=E5=87=BABUG?= =?UTF-8?q?=EF=BC=9B=E8=B0=83=E6=95=B4OUT=5FOF=5FRANGE=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84SANE=5FSTATUS=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_302.cpp | 2 +- hgsane/sane_hg_mdw.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 9ccbd8b..2a53e9f 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -1079,7 +1079,7 @@ int hg_scanner_302::start(void) else { ret = status_ = SCANNER_ERR_OUT_OF_RANGE; - VLOG_MINI_2(LOG_LEVEL_WARNING, "The device is abnormal and can not be scanned : %s\n", val, hg_scanner_err_name(ret)); + VLOG_MINI_2(LOG_LEVEL_WARNING, "The device is abnormal(%d) and can not be scanned : %s\n", val, hg_scanner_err_name(ret)); //break; } diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index 8f35bf0..55e6950 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -57,7 +57,7 @@ namespace local_utility //RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_START, SANE_STATUS_NO_DOCS); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NO_DATA, SANE_STATUS_EOF); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO, SANE_STATUS_IO_ERROR); - RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_NO_MEM); + RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_INVAL); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO, SANE_STATUS_IO_ERROR); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR); @@ -85,7 +85,7 @@ namespace local_utility //RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_NOT_START); RETURN_MATCH_ERROR(statu, SANE_STATUS_EOF, SCANNER_ERR_NO_DATA); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_IO); - RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_MEM, SCANNER_ERR_OUT_OF_RANGE); + RETURN_MATCH_ERROR(statu, SANE_STATUS_INVAL, SCANNER_ERR_OUT_OF_RANGE); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_IO); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_TIMEOUT); From c2447318364a8f3da8e0a208f2a764d7872c7e8a Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 2 Jun 2023 11:31:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=814?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_302.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 2a53e9f..3b4294a 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -1078,7 +1078,7 @@ int hg_scanner_302::start(void) ret = status_ = SCANNER_ERR_DEVICE_ISLOCK; else { - ret = status_ = SCANNER_ERR_OUT_OF_RANGE; + ret = status_ = SCANNER_ERR_DEVICE_UNKNOWN_STATUS; VLOG_MINI_2(LOG_LEVEL_WARNING, "The device is abnormal(%d) and can not be scanned : %s\n", val, hg_scanner_err_name(ret)); //break; } From 6f39a35c6552308b6ece1d98f317c263b9b7fd95 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 2 Jun 2023 11:36:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AA=E7=9F=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/wrapper/huagaoxxx_warraper_ex.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp index f456d69..6c29ff4 100644 --- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp +++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp @@ -250,6 +250,7 @@ extern "C" RETURN_IF(err, SCANNER_ERR_DEVICE_ISLOCK); RETURN_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE); RETURN_IF(err, SCANNER_ERR_DEVICE_DEVS_BOOTING); + RETURN_IF(err, SCANNER_ERR_DEVICE_UNKNOWN_STATUS); if (err == SCANNER_ERR_LANG_PAK_LOST) return "SCANNER_ERR_LANG_PAK_LOST"; @@ -322,6 +323,7 @@ extern "C" RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_DEVS_BOOTING); + RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_UNKNOWN_STATUS); if (err == SCANNER_ERR_LANG_PAK_LOST) return "SCANNER_ERR_LANG_PAK_LOST";