From 7d5068ecf8f205b4354fd6103eb2b2b796a03438 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Sat, 3 Jun 2023 16:22:00 +0800 Subject: [PATCH] =?UTF-8?q?sane=5Fstrstatus=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgsane/sane_hg_mdw.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index 55e6950..32b2bb0 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -2401,6 +2401,11 @@ std::vector::iterator hg_sane_middleware::find_openning_device_in_que /// 导出接口 /// extern "C" { // avoid compiler exporting name in C++ style !!! + const char* inner_sane_err_desc(SANE_Status err) + { + return hg_scanner_err_description(local_utility::sane_statu_2_scanner_err(err)); + } + SANE_Status inner_sane_init(SANE_Int* version_code, SANE_Auth_Callback authorize) { local_utility::cb_auth_ = authorize; @@ -2475,7 +2480,8 @@ extern "C" { // avoid compiler exporting name in C++ style !!! } SANE_String_Const inner_sane_strstatus(SANE_Status status) { - return hg_scanner_err_name(status); + // return hg_scanner_err_name(status); + return inner_sane_err_desc(status); } SANE_Status inner_sane_init_ex(SANE_Int* version_code, sane_callback cb, void* param) @@ -2492,10 +2498,6 @@ extern "C" { // avoid compiler exporting name in C++ style !!! { return hg_sane_middleware::instance()->io_control(h, code, data, len); } - const char* inner_sane_err_desc(SANE_Status err) - { - return hg_scanner_err_description(local_utility::sane_statu_2_scanner_err(err)); - } SANE_Status inner_sane_read_ext(SANE_Img_Ext_Info* ext_info, SANE_Int* len) { return SANE_STATUS_UNSUPPORTED;