generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make flann headers independent from OpenCV C API

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-08 00:24:39 +04:00
parent 69648f0a6f
commit ae4e76395f
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/flann/include/opencv2/flann.hpp
View File

@@ -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

4
modules/flann/include/opencv2/flann/miniflann.hpp
View File

@@ -43,8 +43,6 @@
#ifndef _OPENCV_MINIFLANN_HPP_
#define _OPENCV_MINIFLANN_HPP_
#ifdef __cplusplus
#include "opencv2/core.hpp"
#include "opencv2/flann/defines.h"
@@ -157,6 +155,4 @@ protected:
} } // namespace cv::flann
#endif // __cplusplus
#endif