Merge pull request #1 from PaddlePaddle/develop

update-2020-7-17

Merge pull request #1 from PaddlePaddle/develop
update-2020-7-17
26219d5f · shaohua.zhang · GitHub · 0e8a3417 · 311c5997 · 26219d5f
Unverified Commit 26219d5f authored Jul 17, 2020 by shaohua.zhang Committed by GitHub Jul 17, 2020
20 changed files
--- a/deploy/imgs/demo.png
+++ b/deploy/imgs/demo.png
--- 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
--- 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