718c41634f
1.项目后端整体迁移至PaddleOCR-NCNN算法，已通过基本的兼容性测试 2.工程改为使用CMake组织，后续为了更好地兼容第三方库，不再提供QMake工程 3.重整权利声明文件，重整代码工程，确保最小化侵权风险 Log: 切换后端至PaddleOCR-NCNN，切换工程为CMake Change-Id: I4d5d2c5d37505a4a24b389b1a4c5d12f17bfa38c
12 lines
474 B
Diff
12 lines
474 B
Diff
diff -Nuarp opencv-2.4.13.7.orig/include/opencv2/opencv.hpp opencv-2.4.13.7/include/opencv2/opencv.hpp
|
|
--- opencv-2.4.13.7.orig/include/opencv2/opencv.hpp 2021-03-12 10:34:37.813906930 +0800
|
|
+++ opencv-2.4.13.7/include/opencv2/opencv.hpp 2018-07-02 05:41:56.000000000 +0800
|
|
@@ -73,7 +73,6 @@
|
|
#include "opencv2/ml/ml.hpp"
|
|
#endif
|
|
#ifdef HAVE_OPENCV_HIGHGUI
|
|
-#include "opencv2/highgui/highgui_c.h"
|
|
#include "opencv2/highgui/highgui.hpp"
|
|
#endif
|
|
#ifdef HAVE_OPENCV_CONTRIB
|