6.6.0 - 内置模块重写; 新增部分模块及方法; 修复高版本安卓系统兼容问题; 优化文件管理器及打包功能体验

libs/paddleocr/src/main/cpp/CMakeLists.txt

@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.4.1)
 set(PaddleLite_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../PaddleLite")
 include_directories(${PaddleLite_DIR}/cxx/include)
 
-set(OpenCV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../OpenCV/OpenCV-android-sdk/sdk/native/jni")
+set(OpenCV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/sdk/native/jni")
 message(STATUS "opencv dir: ${OpenCV_DIR}")
 find_package(OpenCV REQUIRED)
 message(STATUS "OpenCV libraries: ${OpenCV_LIBS}")

libs/paddleocr/src/main/cpp/ocr_ppredictor.cpp

@@ -198,7 +198,6 @@ void OCR_PPredictor::infer_rec(const cv::Mat &origin_img, int run_cls, OCRPredic
     ocr_result.cls_label = cls_res.cls_label;
   }
 
-
   float wh_ratio = float(crop_img.cols) / float(crop_img.rows);
   cv::Mat input_image = crnn_resize_img(crop_img, wh_ratio);
   input_image.convertTo(input_image, CV_32FC3, 1 / 255.0f);

libs/paddleocr/src/main/java/com/baidu/paddle/lite/ocr/OCRPredictorNative.java

@@ -49,7 +49,6 @@ public class OCRPredictorNative {
         }
     }
 
-
     public ArrayList<OcrResultModel> runImage(Bitmap originalImage, int max_size_len, int run_det, int run_cls, int run_rec) {
         lock.lock();
         try {

libs/paddleocr/src/main/java/com/baidu/paddle/lite/ocr/Predictor.java

@@ -272,7 +272,6 @@ public class Predictor {
         return true;
     }
 
-
     public List<OcrResult> runOcr(Bitmap inputImage) {
         if (inputImage == null || !isLoaded()) {
             return Collections.emptyList();
@@ -304,7 +303,6 @@ public class Predictor {
         return ocrResults;
     }
 
-
     public boolean isLoaded() {
         return paddlePredictor != null && isLoaded;
     }
@@ -376,5 +374,4 @@ public class Predictor {
         }
     }
 
-
 }

libs/paddleocr/src/main/java/com/baidu/paddle/lite/ocr/Utils.java

@@ -101,7 +101,6 @@ public class Utils {
         }
     }
 
-
     public static float[] parseFloatsFromString(String string, String delimiter) {
         String[] pieces = string.trim().toLowerCase().split(delimiter);
         float[] floats = new float[pieces.length];