Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleOCR into fixocr

2ee12253 · LDOUBLEV · bee2b15e · 52ae30b0 · 2ee12253 · 2ee12253
Commit 2ee12253 authored Jul 17, 2020 by LDOUBLEV
20 changed files
--- a/deploy/android_demo/app/src/test/java/com/baidu/paddle/lite/demo/ocr/ExampleUnitTest.java
+++ b/deploy/android_demo/app/src/test/java/com/baidu/paddle/lite/demo/ocr/ExampleUnitTest.java
--- a/deploy/android_demo/build.gradle
+++ b/deploy/android_demo/build.gradle
--- a/deploy/android_demo/gradle.properties
+++ b/deploy/android_demo/gradle.properties
--- a/deploy/android_demo/gradle/wrapper/gradle-wrapper.jar
+++ b/deploy/android_demo/gradle/wrapper/gradle-wrapper.jar
--- a/deploy/android_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/deploy/android_demo/gradle/wrapper/gradle-wrapper.properties
--- a/deploy/android_demo/gradlew
+++ b/deploy/android_demo/gradlew
--- a/deploy/android_demo/gradlew.bat
+++ b/deploy/android_demo/gradlew.bat
--- a/deploy/android_demo/settings.gradle
+++ b/deploy/android_demo/settings.gradle
+include ':app'
--- a/deploy/cpp_infer/include/ocr_rec.h
+++ b/deploy/cpp_infer/include/ocr_rec.h
--- a/deploy/cpp_infer/readme.md
+++ b/deploy/cpp_infer/readme.md
--- a/deploy/cpp_infer/readme_en.md
+++ b/deploy/cpp_infer/readme_en.md
--- a/deploy/cpp_infer/src/ocr_det.cpp
+++ b/deploy/cpp_infer/src/ocr_det.cpp
--- a/deploy/cpp_infer/src/ocr_rec.cpp
+++ b/deploy/cpp_infer/src/ocr_rec.cpp
--- a/deploy/cpp_infer/src/postprocess_op.cpp
+++ b/deploy/cpp_infer/src/postprocess_op.cpp
--- a/deploy/hubserving/ocr_det/module.py
+++ b/deploy/hubserving/ocr_det/module.py
--- a/deploy/hubserving/ocr_rec/module.py
+++ b/deploy/hubserving/ocr_rec/module.py
--- a/deploy/hubserving/ocr_system/module.py
+++ b/deploy/hubserving/ocr_system/module.py
--- a/deploy/ios_demo/download_dependencies.sh
+++ b/deploy/ios_demo/download_dependencies.sh
--- a/deploy/ios_demo/ocr_demo.xcodeproj/project.pbxproj
+++ b/deploy/ios_demo/ocr_demo.xcodeproj/project.pbxproj
--- a/deploy/ios_demo/ocr_demo/AppDelegate.h
+++ b/deploy/ios_demo/ocr_demo/AppDelegate.h