Merge remote-tracking branch 'upstream/dygraph' into dy3

b9098935 · Leif · 47752ddf · 0e32093f · 47752ddf · 47752ddf
Commit b9098935 authored Dec 14, 2020 by Leif
20 changed files
--- 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
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_crnn_process.h
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_crnn_process.h
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_db_post_process.cpp
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_db_post_process.cpp
--- a/deploy/ios_demo/ocr_demo/pdocr/ocr_db_post_process.h
+++ b/deploy/ios_demo/ocr_demo/pdocr/ocr_db_post_process.h