-
Notifications
You must be signed in to change notification settings - Fork 0
/
build_minimal_opencvsharp.patch
115 lines (107 loc) · 3.62 KB
/
build_minimal_opencvsharp.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
diff --git a/src/OpenCvSharpExtern/CMakeLists.txt b/src/OpenCvSharpExtern/CMakeLists.txt
index 4371d2f6..4d5ca954 100644
--- a/src/OpenCvSharpExtern/CMakeLists.txt
+++ b/src/OpenCvSharpExtern/CMakeLists.txt
@@ -9,19 +9,20 @@ IF(APPLE)
link_directories(/usr/local/lib)
ENDIF()
-file(GLOB OPENCVSHARP_FILES *.cpp)
+file(GLOB OPENCVSHARP_FILES core*.cpp imgp*.cpp std*.cpp)
+# file(GLOB OPENCVSHARP_FILES *.cpp)
find_package(OpenCV REQUIRED)
# iconv support isn't automatic on some systems
-if(CMAKE_VERSION VERSION_GREATER "3.11")
- find_package(Iconv QUIET)
- if(Iconv_FOUND)
- ocv_target_link_libraries(${the_module} Iconv::Iconv)
- else()
- ocv_target_compile_definitions(${the_module} PRIVATE "NO_ICONV=1")
- endif()
-endif()
+# if(CMAKE_VERSION VERSION_GREATER "3.11")
+# find_package(Iconv QUIET)
+# if(Iconv_FOUND)
+# ocv_target_link_libraries(${the_module} Iconv::Iconv)
+# else()
+# ocv_target_compile_definitions(${the_module} PRIVATE "NO_ICONV=1")
+# endif()
+# endif()
if(OpenCV_FOUND)
include_directories(${OpenCV_INCLUDE_DIRS})
diff --git a/src/OpenCvSharpExtern/include_opencv.h b/src/OpenCvSharpExtern/include_opencv.h
index d65eb67e..a9e4c65b 100644
--- a/src/OpenCvSharpExtern/include_opencv.h
+++ b/src/OpenCvSharpExtern/include_opencv.h
@@ -39,34 +39,34 @@
#include <opencv2/highgui/highgui_winrt.hpp>
#endif
#include <opencv2/core/utils/logger.hpp>
-#include <opencv2/highgui/highgui_c.h>
+//#include <opencv2/highgui/highgui_c.h>
#include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/shape.hpp>
-#include <opencv2/stitching.hpp>
-#include <opencv2/video.hpp>
+//#include <opencv2/shape.hpp>
+//#include <opencv2/stitching.hpp>
+//#include <opencv2/video.hpp>
#ifndef _WINRT_DLL
-#include <opencv2/superres.hpp>
-#include <opencv2/superres/optical_flow.hpp>
+//#include <opencv2/superres.hpp>
+//#include <opencv2/superres/optical_flow.hpp>
#endif
// opencv_contrib
-#include <opencv2/aruco.hpp>
-#include <opencv2/aruco/charuco.hpp>
-#include <opencv2/bgsegm.hpp>
-#include <opencv2/img_hash.hpp>
-#include <opencv2/line_descriptor.hpp>
-#include <opencv2/optflow.hpp>
-#include <opencv2/quality.hpp>
-#include <opencv2/tracking.hpp>
-#include <opencv2/xfeatures2d.hpp>
-#include <opencv2/ximgproc.hpp>
-#include <opencv2/xphoto.hpp>
+//#include <opencv2/aruco.hpp>
+//#include <opencv2/aruco/charuco.hpp>
+//#include <opencv2/bgsegm.hpp>
+//#include <opencv2/img_hash.hpp>
+//#include <opencv2/line_descriptor.hpp>
+//#include <opencv2/optflow.hpp>
+//#include <opencv2/quality.hpp>
+//#include <opencv2/tracking.hpp>
+//#include <opencv2/xfeatures2d.hpp>
+//#include <opencv2/ximgproc.hpp>
+//#include <opencv2/xphoto.hpp>
#ifndef _WINRT_DLL
-#include <opencv2/wechat_qrcode.hpp>
-#include <opencv2/dnn.hpp>
-#include <opencv2/dnn_superres.hpp>
-#include <opencv2/face.hpp>
-#include <opencv2/text.hpp>
+//#include <opencv2/wechat_qrcode.hpp>
+//#include <opencv2/dnn.hpp>
+//#include <opencv2/dnn_superres.hpp>
+//#include <opencv2/face.hpp>
+//#include <opencv2/text.hpp>
#endif
#include <vector>
diff --git a/src/OpenCvSharpExtern/std_vector.h b/src/OpenCvSharpExtern/std_vector.h
index b0699d03..5a398832 100644
--- a/src/OpenCvSharpExtern/std_vector.h
+++ b/src/OpenCvSharpExtern/std_vector.h
@@ -448,6 +448,7 @@ CVAPI(void) vector_Mat_delete(std::vector<cv::Mat>* vector)
}
#pragma endregion
+#if 0
#pragma region cv::ml::DTrees::Node
CVAPI(std::vector<cv::ml::DTrees::Node>*) vector_DTrees_Node_new1()
@@ -582,4 +583,5 @@ CVAPI(void) vector_KeyLine_delete(std::vector<cv::line_descriptor::KeyLine>* vec
delete vector;
}
#endif
-#pragma endregion
\ No newline at end of file
+#pragma endregion
+#endif