From 3179988ef0e679c5d49af425df65f55f5732c0ec Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Tue, 10 May 2022 15:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83OCR=E6=95=B4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/uos/{arm64 => aarch64}/c_c++调用说明.docx | Bin .../java/OcrSdkDemo_mt/.classpath | 0 .../{arm64 => aarch64}/java/OcrSdkDemo_mt/.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java | 0 .../src/com/hanvon/ocrsdk/SDKInterface.java | 0 .../src/com/hanvon/ocrsdk/TOCRRECT.java | 0 .../OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java | 0 .../lib/uos/{arm64 => aarch64}/java调用说明.docx | Bin .../ocr/lib/uos/{arm64 => aarch64}/lib/libcnocr.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libconvert.so | Bin .../uos/{arm64 => aarch64}/lib/libcrypto.so.1.0.0 | Bin .../ocr/lib/uos/{arm64 => aarch64}/lib/libdocseg.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libexportfile.so | Bin .../uos/{arm64 => aarch64}/lib/libhwocrdetect.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libhwocrjni.so | Bin .../ocr/lib/uos/{arm64 => aarch64}/lib/libofd.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libpdfparse.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libtinyxml2.so | Bin .../lib/uos/{arm64 => aarch64}/lib/libtinyxml2.so.8 | Bin .../uos/{arm64 => aarch64}/lib/libtinyxml2.so.8.0.0 | Bin .../ocr/lib/uos/{arm64 => aarch64}/lib/libzip.so | Bin .../ocr/lib/uos/{arm64 => aarch64}/lib/libzip.so.5 | Bin .../lib/uos/{arm64 => aarch64}/lib/libzip.so.5.3 | Bin .../ocr/lib/uos/{arm64 => aarch64}/readme.txt | 0 .../ocr/lib/uos/{arm64 => aarch64}/test.cpp | 0 hgdriver/hgdev/CMakeLists.txt | 6 ++++-- hgdriver/hgdev/image_process.cpp | 2 +- hgdriver/wrapper/CMakeLists.txt | 11 +++++++++++ 29 files changed, 16 insertions(+), 3 deletions(-) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/c_c++调用说明.docx (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/.classpath (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/.project (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/.settings/org.eclipse.core.resources.prefs (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/SDKInterface.java (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/TOCRRECT.java (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/java调用说明.docx (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libcnocr.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libconvert.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libcrypto.so.1.0.0 (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libdocseg.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libexportfile.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libhwocrdetect.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libhwocrjni.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libofd.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libpdfparse.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libtinyxml2.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libtinyxml2.so.8 (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libtinyxml2.so.8.0.0 (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libzip.so (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libzip.so.5 (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/lib/libzip.so.5.3 (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/readme.txt (100%) rename hgdriver/3rdparty/ocr/lib/uos/{arm64 => aarch64}/test.cpp (100%) diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/c_c++调用说明.docx b/hgdriver/3rdparty/ocr/lib/uos/aarch64/c_c++调用说明.docx similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/c_c++调用说明.docx rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/c_c++调用说明.docx diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.classpath b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.classpath similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.classpath rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.classpath diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.project b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.project similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.project rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.project diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.settings/org.eclipse.core.resources.prefs b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/.settings/org.eclipse.core.resources.prefs rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/.settings/org.eclipse.core.resources.prefs diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/OCRLayoutBlockInfo.java diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/SDKInterface.java b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/SDKInterface.java similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/SDKInterface.java rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/SDKInterface.java diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/TOCRRECT.java b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/TOCRRECT.java similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/TOCRRECT.java rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/TOCRRECT.java diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java/OcrSdkDemo_mt/src/com/hanvon/ocrsdk/test.java diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/java调用说明.docx b/hgdriver/3rdparty/ocr/lib/uos/aarch64/java调用说明.docx similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/java调用说明.docx rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/java调用说明.docx diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libcnocr.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libcnocr.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libcnocr.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libcnocr.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libconvert.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libconvert.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libconvert.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libconvert.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libcrypto.so.1.0.0 b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libcrypto.so.1.0.0 similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libcrypto.so.1.0.0 rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libcrypto.so.1.0.0 diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libdocseg.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libdocseg.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libdocseg.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libdocseg.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libexportfile.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libexportfile.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libexportfile.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libexportfile.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libhwocrdetect.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libhwocrdetect.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libhwocrdetect.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libhwocrdetect.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libhwocrjni.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libhwocrjni.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libhwocrjni.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libhwocrjni.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libofd.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libofd.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libofd.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libofd.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libpdfparse.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libpdfparse.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libpdfparse.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libpdfparse.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so.8 b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so.8 similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so.8 rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so.8 diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so.8.0.0 b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so.8.0.0 similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libtinyxml2.so.8.0.0 rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libtinyxml2.so.8.0.0 diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so.5 b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so.5 similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so.5 rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so.5 diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so.5.3 b/hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so.5.3 similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/lib/libzip.so.5.3 rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/lib/libzip.so.5.3 diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/readme.txt b/hgdriver/3rdparty/ocr/lib/uos/aarch64/readme.txt similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/readme.txt rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/readme.txt diff --git a/hgdriver/3rdparty/ocr/lib/uos/arm64/test.cpp b/hgdriver/3rdparty/ocr/lib/uos/aarch64/test.cpp similarity index 100% rename from hgdriver/3rdparty/ocr/lib/uos/arm64/test.cpp rename to hgdriver/3rdparty/ocr/lib/uos/aarch64/test.cpp diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index 4b7ea94..8222a6c 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -42,7 +42,9 @@ target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../ImageProcess - ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include ${PROJECT_SOURCE_DIR}/../../../sdk/include - ) + ${PROJECT_SOURCE_DIR}/../3rdparty/hanwangOCRdetect.h + ${PROJECT_SOURCE_DIR}/../3rdparty/ocrcommon.h + ) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 03ca150..b1749d4 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -685,7 +685,7 @@ namespace hg_imgproc return HG_ERR_OK; } // final - + //int ocr public: int final(void) { diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index 7855cdc..1bf9499 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -47,6 +47,17 @@ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libittnotify.a ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libtegra_hal.a + + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libcnocr.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libconvert.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libdocseg.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libexportfile.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libhwocrdetect.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libhwocrjni.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libofd.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libpdfparse.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libtinyxml2.so + ${PROJECT_SOURCE_DIR}/../3rdparty/ocr/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/lib/libzip.so #message("静态库预留03") #message("静态库预留04") )