diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b08a5c..6bb0aee 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.12) project(RapidOCR) @@ -12,10 +12,9 @@ endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/cpp/BaiPiaoOcrOnnx/include) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/onnxruntime/) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/ /rapidocr/include) - - +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/onnxruntime/) if(WIN32) @@ -25,15 +24,26 @@ if(WIN32) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/win/x64/) link_directories(c:/rapidocr/onnxruntime-win-x64-1.7.0/lib) set(OpenCV_DIR c:/rapidocr/windows-x64) + ELSE(CMAKE_CL_64) set(platform x86) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/win/x86/) link_directories(c:/rapidocr/onnxruntime-win-x86-1.7.0/lib) set(OpenCV_DIR c:/rapidocr/windows-x86) + ENDIF(CMAKE_CL_64) + set(OpenCV_STATIC 1) + if(MSVC) + add_compile_options( + $<$:/MT> #---------| + $<$:/MTd> #---|-- Statically link the runtime libraries + $<$:/MT> #--| + ) +endif() + # 指向下载的opencv解开后的目录,下面会有bin/lib/include等目录 elseif(UNIX) @@ -85,6 +95,8 @@ add_library(rapidocrapi SHARED ${OCR_SRC}) target_compile_definitions(rapidocrapi PUBLIC -D_BPOCR_LIB) + + # test program set(BPOCRTESTSRC api4cpp/rapidocrtest.cpp) add_executable(rapidocrtest ${BPOCRTESTSRC}) diff --git a/api4cpp/rapidocr_api.cpp b/api4cpp/rapidocr_api.cpp index 2d571e0..c9dcd84 100755 --- a/api4cpp/rapidocr_api.cpp +++ b/api4cpp/rapidocr_api.cpp @@ -43,7 +43,7 @@ extern "C" if (Param.boxScoreThresh == 0) Param.boxScoreThresh = 0.5; if (Param.boxThresh == 0) - Param.boxThresh = 0.3; + Param.boxThresh = 0.3f; if (Param.flagDoAngle == 0) Param.flagDoAngle = 1; if (Param.flagMostAngle == 0)