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/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
--- a/deploy/ios_demo/ocr_demo/timer.h
+++ b/deploy/ios_demo/ocr_demo/timer.h
--- a/doc/datasets/captcha_demo.png
+++ b/doc/datasets/captcha_demo.png
--- a/doc/datasets/ccpd_demo.png
+++ b/doc/datasets/ccpd_demo.png
--- a/doc/datasets/cmb_demo.jpg
+++ b/doc/datasets/cmb_demo.jpg
--- a/doc/datasets/nist_demo.png
+++ b/doc/datasets/nist_demo.png
--- a/doc/doc_ch/FAQ.md
+++ b/doc/doc_ch/FAQ.md
--- a/doc/doc_ch/handwritten_datasets.md
+++ b/doc/doc_ch/handwritten_datasets.md
--- a/doc/doc_ch/inference.md
+++ b/doc/doc_ch/inference.md
--- a/doc/doc_ch/installation.md
+++ b/doc/doc_ch/installation.md
--- a/doc/doc_ch/serving.md
+++ b/doc/doc_ch/serving.md
--- a/doc/doc_ch/tricks.md
+++ b/doc/doc_ch/tricks.md
--- a/doc/doc_ch/vertical_and_multilingual_datasets.md
+++ b/doc/doc_ch/vertical_and_multilingual_datasets.md
--- a/doc/doc_en/benchmark_en.md
+++ b/doc/doc_en/benchmark_en.md
--- a/doc/doc_en/data_annotation_en.md
+++ b/doc/doc_en/data_annotation_en.md
--- a/doc/doc_en/data_synthesis_en.md
+++ b/doc/doc_en/data_synthesis_en.md
--- a/doc/doc_en/detection_en.md
+++ b/doc/doc_en/detection_en.md
--- a/doc/doc_en/handwritten_datasets_en.md
+++ b/doc/doc_en/handwritten_datasets_en.md