Renamed header include sentinels to fix compile problem when used together with standalone flann

2010-10-20 19:05:41 +00:00
parent e842a0c816
commit e77e152a15
25 changed files with 73 additions and 73 deletions
--- a/modules/flann/include/opencv2/flann/sampling.h
+++ b/modules/flann/include/opencv2/flann/sampling.h
@@ -27,8 +27,8 @@
 *************************************************************************/


-#ifndef SAMPLING_H_
-#define SAMPLING_H_
+#ifndef _OPENCV_SAMPLING_H_
+#define _OPENCV_SAMPLING_H_


 #include "opencv2/flann/matrix.h"
@@ -91,4 +91,4 @@ Matrix<T> random_sample(const Matrix<T>& srcMatrix, size_t size)

 } // namespace cvflann

-#endif /* SAMPLING_H_ */
+#endif /* _OPENCV_SAMPLING_H_ */