From 5d3422d1404f0d1824693148978f62f669ac5964 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Wed, 15 Jun 2022 10:09:26 +0800 Subject: [PATCH] =?UTF-8?q?libusb=E7=9A=84=E7=BC=96=E8=AF=91=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner_239.cpp | 7 +++++-- hgdriver/wrapper/CMakeLists.txt | 12 ++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 4f38871..7125539 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -806,8 +806,11 @@ else ic.imageRotateDegree *= 90.0f; - ic.is_duplex = (image_prc_param_.bits.page == PAGE_DOUBLE || image_prc_param_.bits.page == PAGE_OMIT_EMPTY || - image_prc_param_.bits.page == PAGE_OMIT_EMPTY_RECEIPT || image_prc_param_.bits.page ==PAGE_FOLIO); + ic.is_duplex = (image_prc_param_.bits.page == PAGE_DOUBLE + || image_prc_param_.bits.page == PAGE_OMIT_EMPTY + || image_prc_param_.bits.page == PAGE_OMIT_EMPTY_RECEIPT + || image_prc_param_.bits.page ==PAGE_FOLIO); + ic.en_fold = (image_prc_param_.bits.page == PAGE_FOLIO); ic.pixtype = image_prc_param_.bits.color_mode == COLOR_MODE_AUTO_MATCH ? 2 : image_prc_param_.bits.color_mode; ic.automaticcolor = is_auto_matic_color; diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index c072a01..4ba1a35 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -23,9 +23,17 @@ message(STATUS ${CMAKE_HOST_SYSTEM}) message(STATUS ${CMAKE_SYSTEM_PROCESSOR}) message(STATUS ${CMAKE_HOST_SYSTEM_NAME}) -target_link_libraries(${PROJECT_NAME} PRIVATE udev) + +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 + ) +else() + message("current platform: Windows ") +endif() + target_link_libraries(${PROJECT_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a + ${PROJECT_SOURCE_DIR}/../../../build/libgdev.a ${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libopencv_world.a