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/ios_demo/ocr_demo/AppDelegate.m
+++ b/deploy/ios_demo/ocr_demo/AppDelegate.m
--- a/deploy/ios_demo/ocr_demo/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/deploy/ios_demo/ocr_demo/Assets.xcassets/AppIcon.appiconset/Contents.json
--- a/deploy/ios_demo/ocr_demo/Assets.xcassets/Contents.json
+++ b/deploy/ios_demo/ocr_demo/Assets.xcassets/Contents.json
--- a/deploy/ios_demo/ocr_demo/Base.lproj/LaunchScreen.storyboard
+++ b/deploy/ios_demo/ocr_demo/Base.lproj/LaunchScreen.storyboard
--- a/deploy/ios_demo/ocr_demo/Base.lproj/Main.storyboard
+++ b/deploy/ios_demo/ocr_demo/Base.lproj/Main.storyboard
--- a/deploy/ios_demo/ocr_demo/BoxLayer.h
+++ b/deploy/ios_demo/ocr_demo/BoxLayer.h
--- a/deploy/ios_demo/ocr_demo/BoxLayer.m
+++ b/deploy/ios_demo/ocr_demo/BoxLayer.m
--- a/deploy/ios_demo/ocr_demo/Helpers.h
+++ b/deploy/ios_demo/ocr_demo/Helpers.h
--- a/deploy/ios_demo/ocr_demo/Helpers.m
+++ b/deploy/ios_demo/ocr_demo/Helpers.m
--- a/deploy/ios_demo/ocr_demo/Info.plist
+++ b/deploy/ios_demo/ocr_demo/Info.plist
--- a/deploy/ios_demo/ocr_demo/OcrData.h
+++ b/deploy/ios_demo/ocr_demo/OcrData.h
--- a/deploy/ios_demo/ocr_demo/OcrData.m
+++ b/deploy/ios_demo/ocr_demo/OcrData.m
--- a/deploy/ios_demo/ocr_demo/ViewController.h
+++ b/deploy/ios_demo/ocr_demo/ViewController.h
--- a/deploy/ios_demo/ocr_demo/ViewController.mm
+++ b/deploy/ios_demo/ocr_demo/ViewController.mm
--- a/deploy/ios_demo/ocr_demo/label_list.txt
+++ b/deploy/ios_demo/ocr_demo/label_list.txt
--- a/deploy/ios_demo/ocr_demo/main.m
+++ b/deploy/ios_demo/ocr_demo/main.m
--- a/deploy/ios_demo/ocr_demo/ocr.png
+++ b/deploy/ios_demo/ocr_demo/ocr.png
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_clipper.cpp
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_clipper.cpp
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_clipper.hpp
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_clipper.hpp
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_crnn_process.cpp
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_crnn_process.cpp