fix opencv2 highgui include

Author: nihui

.github/workflows/release.yml

@@ -181,6 +181,7 @@ jobs:
         truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
         patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
         patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
+        patch -p1 -i ../opencv-2.4.13.7-fix-highgui-include.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
     - name: build-armeabi-v7a
@@ -370,6 +371,7 @@ jobs:
         echo -n > cmake/OpenCVFindLibsGrfmt.cmake
         patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
         patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
+        patch -p1 -i ../opencv-2.4.13.7-fix-highgui-include.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
     - name: build-ios
@@ -542,6 +544,7 @@ jobs:
         echo -n > cmake/OpenCVFindLibsGrfmt.cmake
         patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
         patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
+        patch -p1 -i ../opencv-2.4.13.7-fix-highgui-include.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
     - name: build-ios
@@ -750,6 +753,7 @@ jobs:
         truncate -s 0 cmake/OpenCVFindLibsGrfmt.cmake
         patch -p1 -i ../opencv-2.4.13.7-no-rtti.patch
         patch -p1 -i ../opencv-2.4.13.7-no-zlib.patch
+        patch -p1 -i ../opencv-2.4.13.7-fix-highgui-include.patch
         rm -rf modules/highgui
         cp -r ../highgui modules/
     - name: build-arm-linux-gnueabi

opencv-2.4.13.7-fix-highgui-include.patch

@@ -0,0 +1,11 @@
+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,6 +73,7 @@
+ #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