From 0424531f2ed2cd879f7f831459a630557a0aee3a Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Sat, 6 Aug 2022 20:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPNP=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=9C=89=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E4=B8=A2=E5=A4=B1=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 +- hgdriver/hgdev/scanner_manager.cpp | 4 ++-- hgsane/sane_hg_mdw.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 37ef765..3d16ced 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ cpu=$(arch) #cpu架构 sys=$(cat /etc/issue) sys=${sys%% *} #操作系统 mainverstr="s/ver_1/4/g" #版本控制 -minver="15" +minver="16" minverstr="s/ver_2/" verstr3="s/ver_3/" ver3=10 diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index 90bf0e4..25a61f8 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -222,8 +222,8 @@ void hg_scanner_mgr::on_hgscanner_pnp(usb_event ev, libusb_device* device, int v VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "%s connected.\n", g_supporting_devices[i].name.c_str()); index = i; ev_ui = SANE_EVENT_DEVICE_ARRIVED; - de.name = g_supporting_devices[i].name.c_str(); - de.type = g_supporting_devices[i].type.c_str(); + name = g_supporting_devices[i].name.c_str(); + type = g_supporting_devices[i].type.c_str(); break; } } diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index 1260542..2d8544d 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -52,7 +52,7 @@ namespace local_utility //RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_OPEN, SANE_STATUS_NO_DOCS); //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_HAS_DATA_YET, SANE_STATUS_IO_ERROR); + 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_IO, SANE_STATUS_IO_ERROR); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR); @@ -78,7 +78,7 @@ namespace local_utility //RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_NOT_OPEN); //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_HAS_DATA_YET); + 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_IO_ERROR, SCANNER_ERR_IO); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_TIMEOUT);