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

2401626a · dyning · 160bb06e · b0171a71 · 2401626a · 2401626a
Commit 2401626a authored Jun 23, 2020 by dyning
13 changed files
--- a/ppocr/postprocess/lanms/include/pybind11/eigen.h
+++ b/ppocr/postprocess/lanms/include/pybind11/eigen.h
--- a/ppocr/postprocess/lanms/include/pybind11/embed.h
+++ b/ppocr/postprocess/lanms/include/pybind11/embed.h
--- a/ppocr/postprocess/lanms/include/pybind11/eval.h
+++ b/ppocr/postprocess/lanms/include/pybind11/eval.h
--- a/ppocr/postprocess/lanms/include/pybind11/functional.h
+++ b/ppocr/postprocess/lanms/include/pybind11/functional.h
--- a/ppocr/postprocess/lanms/include/pybind11/numpy.h
+++ b/ppocr/postprocess/lanms/include/pybind11/numpy.h
--- a/ppocr/postprocess/lanms/include/pybind11/operators.h
+++ b/ppocr/postprocess/lanms/include/pybind11/operators.h
--- a/ppocr/postprocess/lanms/include/pybind11/options.h
+++ b/ppocr/postprocess/lanms/include/pybind11/options.h
--- a/ppocr/postprocess/lanms/include/pybind11/pybind11.h
+++ b/ppocr/postprocess/lanms/include/pybind11/pybind11.h
--- a/ppocr/postprocess/lanms/include/pybind11/pytypes.h
+++ b/ppocr/postprocess/lanms/include/pybind11/pytypes.h
--- a/ppocr/postprocess/lanms/include/pybind11/stl.h
+++ b/ppocr/postprocess/lanms/include/pybind11/stl.h
--- a/ppocr/postprocess/lanms/include/pybind11/stl_bind.h
+++ b/ppocr/postprocess/lanms/include/pybind11/stl_bind.h
--- a/ppocr/postprocess/lanms/include/pybind11/typeid.h
+++ b/ppocr/postprocess/lanms/include/pybind11/typeid.h
--- a/ppocr/postprocess/lanms/lanms.h
+++ b/ppocr/postprocess/lanms/lanms.h