Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
bd82f6a22d
|
@ -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;
|
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;
|
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,13 +31,12 @@ g_supporting_devices[] = {
|
||||||
, {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""}
|
, {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""}
|
||||||
, {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
|
, {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
|
||||||
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""},
|
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""},
|
||||||
#endif
|
#elif defined(OEM_HANWANG)
|
||||||
#ifdef OEM_HANWANG
|
|
||||||
{0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
|
{0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
|
||||||
, {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""}
|
, {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""}
|
||||||
, {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""}
|
, {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""}
|
||||||
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""},
|
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""},
|
||||||
#endif
|
#else
|
||||||
{0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""}
|
{0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""}
|
||||||
, {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""}
|
, {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""}
|
||||||
, {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}
|
, {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}
|
||||||
|
@ -47,6 +46,7 @@ g_supporting_devices[] = {
|
||||||
, {0x3072, 0x339, SCANNER_NAME_HG_G339, "GScanO1003399", ""}
|
, {0x3072, 0x339, SCANNER_NAME_HG_G339, "GScanO1003399", ""}
|
||||||
, {0x3072, 0x439, SCANNER_NAME_HG_G439, "GScanO1003399", ""}
|
, {0x3072, 0x439, SCANNER_NAME_HG_G439, "GScanO1003399", ""}
|
||||||
, {0x064B, 0x7823, SCANNER_NAME_HG_G200, "GScanO200", ""}
|
, {0x064B, 0x7823, SCANNER_NAME_HG_G200, "GScanO200", ""}
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
static std::string g_vendor = COMPANY_NAME;
|
static std::string g_vendor = COMPANY_NAME;
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,9 @@ 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")
|
file(GLOB DIR_HEADS "${PROJECT_SOURCE_DIR}/*.h" "${PROJECT_SOURCE_DIR}/*.hpp")
|
||||||
set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS})
|
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})
|
add_library(${PROJECT_NAME} SHARED ${DIR_SRCS})
|
||||||
message(STATUS ${CMAKE_SYSTEM_NAME})
|
message(STATUS ${CMAKE_SYSTEM_NAME})
|
||||||
message(STATUS ${CMAKE_HOST_SYSTEM})
|
message(STATUS ${CMAKE_HOST_SYSTEM})
|
||||||
|
@ -25,9 +28,9 @@ message(STATUS ${CMAKE_HOST_SYSTEM_NAME})
|
||||||
|
|
||||||
|
|
||||||
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
|
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE udev
|
#link_directories(${PROJECT_SOURCE_DIR}/../../../sdk/lib/kylin/${CMAKE_SYSTEM_PROCESSOR})
|
||||||
${PROJECT_SOURCE_DIR}/../../../sdk/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a
|
#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()
|
else()
|
||||||
message("current platform: Windows ")
|
message("current platform: Windows ")
|
||||||
endif()
|
endif()
|
||||||
|
@ -35,6 +38,7 @@ endif()
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE
|
target_link_libraries(${PROJECT_NAME} PRIVATE
|
||||||
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../build/libgdev.a
|
${PROJECT_SOURCE_DIR}/../../../build/libgdev.a
|
||||||
|
${PROJECT_SOURCE_DIR}/../../../sdk/lib/kylin/${CMAKE_SYSTEM_PROCESSOR}/libusb-1.0.a #kylin下放的先后顺序不对可能会导致库链接不上
|
||||||
${PROJECT_SOURCE_DIR}/../../../build/libgimgproc.a
|
${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}/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
|
||||||
|
@ -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}/libquirc.a
|
||||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libzlib.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
|
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/liblibwebp.a
|
||||||
)
|
udev pthread dl )
|
||||||
|
|
||||||
#勿修改下面预留行
|
#勿修改下面预留行
|
||||||
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
|
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||||
|
@ -99,7 +103,6 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0 dl)
|
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
|
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
|
||||||
${PROJECT_SOURCE_DIR}/../3rdparty/nick
|
${PROJECT_SOURCE_DIR}/../3rdparty/nick
|
||||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
|
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
|
||||||
|
|
Loading…
Reference in New Issue