version 1.7.0: opencv 4.6.0, ncnn 20220420, 修改c导出api，注释无用的调试输出，模型格式变化，需要重新转换模型，增加clibtest项目地址

Author: benjaminwan

BUILD.md

@@ -6,8 +6,8 @@
 
 * OpenCV静态库：opencv-(版本号)-平台.7z，
 * 把压缩包解压到项目根目录，windows平台需要注意目录层次，解压后目录结构如下
-* windows平台请选择vs2017版本(也可以用于vs2019编译)
-* 程序版本v1.6.0需要opencv 4.5.4
+* 程序版本v1.6.0依赖opencv 4.5.4
+* 程序版本v1.7.0依赖opencv 4.6.0
 ```
 OcrLiteNcnn/opencv-static
 ├── OpenCVWrapperConfig.cmake
@@ -23,6 +23,7 @@ OcrLiteNcnn/opencv-static
 * ncnn静态库：ncnn-(版本号)-平台.7z
 * 注意：本demo从v1.5.1开始，去除crnn的lstm外循环改用框架的实现，需要配合ncnn>=20210124，请注意选择ncnn版本。
 * 程序版本v1.6.0需要ncnn 20210720
+* 程序版本v1.7.0依赖ncnn 20220420，此版本模型格式支持有变化，原有的db和angle模型需重新用onnx2ncnn工具转换
 * 把压缩包解压到项目根目录，windows平台需要注意目录层次，解压后目录结构如下
 
 ```

CMakeLists.txt

@@ -7,6 +7,7 @@ elseif (UNIX)
 endif ()
 project(OcrLiteNcnn)
 
+# Output BIN JNI CLIB
 if (NOT DEFINED OCR_OUTPUT)
     set(OCR_OUTPUT "BIN")
     message(STATUS "No OCR_OUTPUT, defaulting to BIN")
@@ -27,34 +28,6 @@ else ()
     add_definitions("-Wall")
 endif ()
 
-# OpenMP flags for MACOS
-if (APPLE)
-    if (CMAKE_C_COMPILER_ID MATCHES "Clang")
-        set(OpenMP_C "${CMAKE_C_COMPILER}")
-        set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I/usr/local/opt/libomp/include")
-        set(OpenMP_C_LIB_NAMES "omp")
-        set(OpenMP_omp_LIBRARY ${OpenMP_C_LIB_NAMES})
-    endif ()
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(OpenMP_CXX "${CMAKE_CXX_COMPILER}")
-        set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/usr/local/opt/libomp/include")
-        set(OpenMP_CXX_LIB_NAMES "omp")
-        set(OpenMP_omp_LIBRARY ${OpenMP_C_LIB_NAMES})
-    endif ()
-    link_directories("/usr/local/opt/libomp/lib")
-endif ()
-
-# OpenMP
-find_package(OpenMP REQUIRED)
-if (OPENMP_FOUND)
-    message("OPENMP FOUND")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-else ()
-    message(FATAL_ERROR "OpenMP Not Found!")
-endif ()
-
 # NCNN
 if (OCR_VULKAN STREQUAL "GPU")
     include(${CMAKE_CURRENT_SOURCE_DIR}/ncnn-vulkan-static/NcnnWrapperConfig.cmake)
@@ -102,15 +75,15 @@ endif ()
 if (OCR_OUTPUT STREQUAL "JNI") # JNI
     add_library(OcrLiteNcnn SHARED ${OCR_COMPILE_CODE})
     target_compile_definitions(OcrLiteNcnn PRIVATE __JNI__)
-    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${JNI_LIBS} ${OpenMP_CXX_LIB_NAMES})
-elseif(OCR_OUTPUT STREQUAL "CLIB") # CLIB
+    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${JNI_LIBS})
+elseif (OCR_OUTPUT STREQUAL "CLIB") # CLIB
     add_library(OcrLiteNcnn SHARED ${OCR_COMPILE_CODE})
     target_compile_definitions(OcrLiteNcnn PRIVATE __CLIB__)
-    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
-elseif(OCR_OUTPUT STREQUAL "BIN") # BIN
+    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS})
+elseif (OCR_OUTPUT STREQUAL "BIN") # BIN
     add_executable(OcrLiteNcnn ${OCR_COMPILE_CODE})
     target_compile_definitions(OcrLiteNcnn PRIVATE __EXEC__)
-    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
+    target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS})
 endif ()
 
 install(TARGETS OcrLiteNcnn EXPORT OcrLiteNcnn)
@@ -133,7 +106,7 @@ if (OCR_BENCHMARK AND (OCR_OUTPUT STREQUAL "BIN"))
             src/getopt.cpp
             src/OcrLite.cpp
             src/OcrUtils.cpp)
-    target_link_libraries(benchmark ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
+    target_link_libraries(benchmark ncnn ${OpenCV_LIBS})
     target_compile_definitions(benchmark PRIVATE __EXEC__)
 
     if (OCR_VULKAN STREQUAL "GPU")

README.md

@@ -21,6 +21,7 @@
 * 各平台可执行文件：linux-bin.7z、macos-bin.7z、windows-bin.7z
 * 用于java的jni库：linux-jni.7z、macos-jni.7z、windows-jni.7z
 * 用于C的动态库：linux-clib.7z、macos-clib.7z、windows-clib.7z
+* C动态库调用范例:[OcrLiteNcnnLibTest](https://github.com/benjaminwan/OcrLiteNcnnLibTest)
 * 注意：linux编译平台为ubuntu18.04，如果你的linux版本无法运行demo，请自行从源码编译依赖库和完整项目。
 
 ### 介绍
@@ -37,16 +38,22 @@ ChineseOcr Lite Ncnn，超轻量级中文OCR PC Demo，支持ncnn推理
 
 ### 更新说明
 
+#### 2021-10-13 update
+
+* opencv 4.5.4
+* ncnn 20210720
+* 优化编译脚本和测试脚本
+
 #### 2021-10-25 update
 
 * fix:win编译打包C动态库缺少lib文件
 * 编译c动态库添加打包include
 
-#### 2021-10-13 update
+#### 2021-10-25 update
 
-* opencv 4.5.4
-* ncnn 20210720
-* 优化编译脚本和测试脚本
+* opencv 4.6.0
+* ncnn 20220420，模型格式变化，需重新转换db和angle模型
+* 修改c lib导出方法，支持C调用
 
 ### 模型下载
 
@@ -75,7 +82,7 @@ OcrLiteNcnn/models
 
 ### FAQ
 
-#### macOS缺少openmp
+#### macOS缺少openmp(从1.7.0开始已不再依赖openmp)
 
 ```brew install libomp```
 

include/OcrLiteCApi.h

@@ -0,0 +1,55 @@
+#ifdef __cplusplus
+#ifndef __OCR_LITE_C_API_H__
+#define __OCR_LITE_C_API_H__
+extern "C"
+{
+
+#ifdef WIN32
+#ifdef __CLIB__
+#define _QM_OCR_API __declspec(dllexport)
+#else
+#define _QM_OCR_API __declspec(dllimport)
+#endif
+#else
+#define _QM_OCR_API
+#endif
+
+typedef void *OCR_HANDLE;
+typedef char BOOL;
+
+#ifndef NULL
+#define NULL 0
+#endif
+#define TRUE 1
+#define FALSE 0
+
+typedef struct __ocr_param {
+    int padding;
+    int maxSideLen;
+    float boxScoreThresh;
+    float boxThresh;
+    float unClipRatio;
+    int doAngle; // 1 means do
+    int mostAngle; // 1 means true
+} OCR_PARAM;
+
+/*
+* nThreads should be the number of threads
+* gpuIndex: -1 means use cpu, 0 means use gpu0...
+*/
+_QM_OCR_API OCR_HANDLE
+OcrInit(const char *szDetModel, const char *szClsModel, const char *szRecModel, const char *szKeyPath, int nThreads,
+        int gpuIndex);
+
+_QM_OCR_API BOOL
+OcrDetect(OCR_HANDLE handle, const char *imgPath, const char *imgName, OCR_PARAM *pParam);
+
+_QM_OCR_API int OcrGetLen(OCR_HANDLE handle);
+
+_QM_OCR_API BOOL OcrGetResult(OCR_HANDLE handle, char *szBuf, int nLen);
+
+_QM_OCR_API void OcrDestroy(OCR_HANDLE handle);
+
+};
+#endif //__OCR_LITE_C_API_H__
+#endif //__cplusplus

include/OcrLiteCaller.h

@@ -4,8 +4,6 @@
 #include "opencv2/core.hpp"
 #include <vector>
 
-#include "OcrLitePort.h"
-
 struct ScaleParam {
     int srcWidth;
     int srcHeight;
@@ -32,7 +30,7 @@ struct TextLine {
     double time;
 };
 
-struct OCRLITE_PORT TextBlock {
+struct TextBlock {
     std::vector<cv::Point> boxPoint;
     float boxScore;
     int angleIndex;
@@ -44,7 +42,7 @@ struct OCRLITE_PORT TextBlock {
     double blockTime;
 };
 
-struct OCRLITE_PORT OcrResult {
+struct OcrResult {
     double dbNetTime;
     std::vector<TextBlock> textBlocks;
     cv::Mat boxImg;

include/OcrLitePort.h

@@ -1,6 +1,6 @@
 #ifndef __OCR_VERSION_H__
 #define __OCR_VERSION_H__
 
-#define VERSION "1.6.0.20211013"
+#define VERSION "1.7.0"
 
 #endif //__OCR_VERSION_H__

include/OcrStruct.h

@@ -98,7 +98,7 @@ std::vector<Angle> AngleNet::getAngles(std::vector<cv::Mat> &partImgs, const cha
         } else {//all angle set to 1
             mostAngleIndex = 1;
         }
-        printf("Set All Angle to mostAngleIndex(%d)\n", mostAngleIndex);
+        //printf("Set All Angle to mostAngleIndex(%d)\n", mostAngleIndex);
         for (int i = 0; i < angles.size(); ++i) {
             Angle angle = angles[i];
             angle.index = mostAngleIndex;

include/version.h

@@ -46,7 +46,7 @@ bool CrnnNet::initModel(const std::string &pathStr, const std::string &keysPath)
         fprintf(stderr, "missing keys\n");
         return false;
     }
-    printf("total keys size(%lu)\n", keys.size());
+    //printf("total keys size(%lu)\n", keys.size());
     return true;
 }