Make flann headers independent from OpenCV C API

2013-04-08 00:24:39 +04:00
parent 69648f0a6f
commit ae4e76395f
4 changed files with 4 additions and 14 deletions
--- a/modules/flann/include/opencv2/flann.hpp
+++ b/modules/flann/include/opencv2/flann.hpp
@@ -43,9 +43,6 @@
 #ifndef _OPENCV_FLANN_HPP_
 #define _OPENCV_FLANN_HPP_

-#ifdef __cplusplus
-
-#include "opencv2/core/types_c.h"
 #include "opencv2/core.hpp"
 #include "opencv2/flann/miniflann.hpp"
 #include "opencv2/flann/flann_base.hpp"
@@ -422,6 +419,4 @@ FLANN_DEPRECATED int hierarchicalClustering(const Mat& features, Mat& centers, c

 } } // namespace cv::flann

-#endif // __cplusplus
-
 #endif