From ded9d29b5f7dcf2c90c93568f6e3a44989de0d02 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 24 Jun 2022 17:06:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BA=B8=E5=BC=A0=E5=B0=BA=E5=AF=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index a6c5c40..0900fcc 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -2563,6 +2563,14 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len) return wait_img_.is_waiting() && wait_usb_.is_waiting() ? SCANNER_ERR_NO_DATA : SCANNER_ERR_OK; } + else if (code == IO_CTRL_CODE_GET_PAPER_SIZE) + { + std::string name((char*)data); + int paper = match_best_paper(name, NULL); + SIZE size = paper_size(paper); + + *len = (size.cx & 0x0ffff) | ((size.cy & 0x0ffff) << 16); + } return SCANNER_ERR_DEVICE_NOT_SUPPORT; } From 27b0caffeed6f3f1f4d14149ac2f99d84255ecd0 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Mon, 27 Jun 2022 11:27:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=84OEM=E7=89=88=E6=9C=AC=E5=8F=AA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=B7=B1=E7=B3=BB=E5=88=97=E7=9A=84?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BB=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/scanner_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index d1c7f8c..6f82390 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -31,13 +31,12 @@ g_supporting_devices[] = { , {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""} , {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""} , {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""}, -#endif -#ifdef OEM_HANWANG +#elif defined(OEM_HANWANG) {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""} , {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""} , {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""} , {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}, -#endif +#else {0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""} , {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""} , {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""} @@ -47,6 +46,7 @@ g_supporting_devices[] = { , {0x3072, 0x339, SCANNER_NAME_HG_G339, "GScanO1003399", ""} , {0x3072, 0x439, SCANNER_NAME_HG_G439, "GScanO1003399", ""} , {0x064B, 0x7823, SCANNER_NAME_HG_G200, "GScanO200", ""} +#endif }; static std::string g_vendor = COMPANY_NAME; From e013d3a181bf26355b4afdfdc7b59f5f25f18196 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Mon, 27 Jun 2022 17:11:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4libusb=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E4=B8=8D=E4=B8=8A=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/wrapper/CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index 4ba1a35..0795ccd 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -14,9 +14,12 @@ add_compile_options(-std=c++11) #set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS} -g -ftest-coverage -fprofile-arcs") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS) +aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS) file(GLOB DIR_HEADS "${PROJECT_SOURCE_DIR}/*.h" "${PROJECT_SOURCE_DIR}/*.hpp") set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS}) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) add_library(${PROJECT_NAME} SHARED ${DIR_SRCS}) message(STATUS ${CMAKE_SYSTEM_NAME}) message(STATUS ${CMAKE_HOST_SYSTEM}) @@ -25,9 +28,9 @@ message(STATUS ${CMAKE_HOST_SYSTEM_NAME}) if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") - target_link_libraries(${PROJECT_NAME} PRIVATE udev - ${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a - ) + #link_directories(${PROJECT_SOURCE_DIR}/../../../sdk/lib/kylin/${CMAKE_SYSTEM_PROCESSOR}) + #target_link_libraries(${PROJECT_NAME} PRIVATE udev pthread dl) + #target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../../../sdk/lib/kylin/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a) else() message("current platform: Windows ") endif() @@ -35,9 +38,10 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../../../build/libgdev.a - ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a + ${PROJECT_SOURCE_DIR}/../../../sdk/lib/kylin/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a #kylin下放的先后顺序不对可能会导致库链接不上 + ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libopencv_world.a - ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libIlmImf.a + ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libIlmImf.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibjasper.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibjpeg-turbo.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibpng.a @@ -46,7 +50,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libquirc.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libzlib.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibwebp.a - ) + udev pthread dl ) #勿修改下面预留行 if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64") @@ -99,7 +103,6 @@ else() endif() -target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0 dl) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include