lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw up

This commit is contained in:
luoliangyi 2022-07-29 11:39:47 +08:00
parent e89af48c50
commit cd0935cde1
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hgdriver/hgdev/image_process.cpp
View File

@ -763,19 +763,33 @@ namespace hg_imgproc
#define test #define test
int ocr_auto_txtdirect() int ocr_auto_txtdirect()
{ {
string scanner_path = hg_log::get_module_full_path("libhwocrdetect.so"); #ifdef OEM_HANWANG
string libname = "libhwdriver.so";
#elif OEM_LISICHENG
string libname = "liblscdriver.so";
#else
string libname = "libhgdriver.so";
#endif
string scanner_path = hg_log::get_module_full_path(libname.c_str());
int pDirect = -1; int pDirect = -1;
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
void *pHanld = NULL; void *pHanld = NULL;
std::vector<cv::Mat> mats(mats_); std::vector<cv::Mat> mats(mats_);
mats_.clear(); mats_.clear();
printf("scanner_path:%s\r\n",scanner_path.c_str());
if(scanner_path.empty()) if(scanner_path.empty())
{ {
return SCANNER_ERR_OUT_OF_RANGE; return SCANNER_ERR_OUT_OF_RANGE;
} }
scanner_path = scanner_path.substr(0,scanner_path.size() - libname.size());
scanner_path+="libhwocrdetect.so";
printf("hwlib path:%s\r\n",scanner_path.c_str());
if(access(scanner_path.c_str(),F_OK) != 0)
{
return SCANNER_ERR_OUT_OF_RANGE;
}
#if ((!defined x86_64) && (!defined WIN32)) #if ((!defined x86_64) && (!defined WIN32))
//linux x86_64 暂时没有OCR三方 //linux x86_64 暂时没有OCR三方
#ifndef test #ifndef test

2
hgdriver/wrapper/CMakeLists.txt
View File

@ -84,7 +84,7 @@ else()
endif() endif()
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl ) target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath=.)
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

2
hgsane/CMakeLists.txt
View File

@ -22,7 +22,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE hgdriver
) )
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl ) target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -Wl,--exclude-libs,ALL -zdefs -Bdirect pthread dl -Wl,-rpath=.)
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/../sdk/hginclude ${PROJECT_SOURCE_DIR}/../sdk/hginclude
${PROJECT_SOURCE_DIR}/../../sdk/include ${PROJECT_SOURCE_DIR}/../../sdk/include