From d14d5233b7d592a2073c7efa6871af2bedf52f6c Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Tue, 10 Jan 2023 09:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/base/test_base.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp index 47cbfb1..c354759 100644 --- a/code/base/test_base.cpp +++ b/code/base/test_base.cpp @@ -887,14 +887,16 @@ public: { str.resize(strl); ret = wchar_to_char(str, p, &strl); + if (str.empty()) + { + return SCANNER_ERR_DATA_DAMAGED; + } + dpi = atoi(str.c_str()); } - if (str.empty()) + if (dpi > 0) { - return SCANNER_ERR_DATA_DAMAGED; + ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &len); } - dpi = atoi(str.c_str()); - ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &len); - if (ret != SCANNER_ERR_OK) { return -1; @@ -924,14 +926,17 @@ public: { str.resize(strl); ret = wchar_to_char(str, p, &strl); + if (str.empty()) + { + return SCANNER_ERR_DATA_DAMAGED; + } + dpi = atoi(str.c_str()); } - if (str.empty()) + if (dpi > 0) { - return SCANNER_ERR_DATA_DAMAGED; + ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &llen); } - dpi = atoi(str.c_str()); - ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &llen); - + ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_IMAGE, &type, &len); if (ret != SCANNER_ERR_OK) { @@ -949,8 +954,6 @@ public: else if (cnt == 10) break; - - Sleep(1000); cnt++; }