Fixing include defines

diff --git a/modules/flann/include/opencv2/flann/flann_base.hpp b/modules/flann/include/opencv2/flann/flann_base.hpp
index 0426262..b5ba7d7 100644 (file)
--- a/modules/flann/include/opencv2/flann/flann_base.hpp
+++ b/modules/flann/include/opencv2/flann/flann_base.hpp
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_BASE_HPP_
-#define FLANN_BASE_HPP_
+#ifndef OPENCV_FLANN_BASE_HPP_
+#define OPENCV_FLANN_BASE_HPP_
 
 #include <vector>
 #include <string>
@@ -288,4 +288,4 @@ int hierarchicalClustering(const Matrix<typename Distance::ElementType>& points,
 }
 
 }
-#endif /* FLANN_BASE_HPP_ */
+#endif /* OPENCV_FLANN_BASE_HPP_ */

diff --git a/modules/flann/include/opencv2/flann/logger.h b/modules/flann/include/opencv2/flann/logger.h
index 303f0c9..24f3fb6 100644 (file)
--- a/modules/flann/include/opencv2/flann/logger.h
+++ b/modules/flann/include/opencv2/flann/logger.h
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_LOGGER_H
-#define FLANN_LOGGER_H
+#ifndef OPENCV_FLANN_LOGGER_H
+#define OPENCV_FLANN_LOGGER_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -127,4 +127,4 @@ private:
 
 }
 
-#endif //FLANN_LOGGER_H
+#endif //OPENCV_FLANN_LOGGER_H

diff --git a/modules/flann/include/opencv2/flann/nn_index.h b/modules/flann/include/opencv2/flann/nn_index.h
index da4dd7f..518babf 100644 (file)
--- a/modules/flann/include/opencv2/flann/nn_index.h
+++ b/modules/flann/include/opencv2/flann/nn_index.h
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_NNINDEX_H
-#define FLANN_NNINDEX_H
+#ifndef OPENCV_FLANN_NNINDEX_H
+#define OPENCV_FLANN_NNINDEX_H
 
 #include <string>
 
@@ -176,4 +176,4 @@ public:
 
 }
 
-#endif //FLANN_NNINDEX_H
+#endif //OPENCV_FLANN_NNINDEX_H

diff --git a/modules/flann/include/opencv2/flann/random.h b/modules/flann/include/opencv2/flann/random.h
index b702807..2a67352 100644 (file)
--- a/modules/flann/include/opencv2/flann/random.h
+++ b/modules/flann/include/opencv2/flann/random.h
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_RANDOM_H
-#define FLANN_RANDOM_H
+#ifndef OPENCV_FLANN_RANDOM_H
+#define OPENCV_FLANN_RANDOM_H
 
 #include <algorithm>
 #include <cstdlib>
@@ -130,6 +130,6 @@ public:
 
 }
 
-#endif //FLANN_RANDOM_H
+#endif //OPENCV_FLANN_RANDOM_H
 
 

diff --git a/modules/flann/include/opencv2/flann/result_set.h b/modules/flann/include/opencv2/flann/result_set.h
index 047466f..7bb709b 100644 (file)
--- a/modules/flann/include/opencv2/flann/result_set.h
+++ b/modules/flann/include/opencv2/flann/result_set.h
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_RESULTSET_H
-#define FLANN_RESULTSET_H
+#ifndef OPENCV_FLANN_RESULTSET_H
+#define OPENCV_FLANN_RESULTSET_H
 
 #include <algorithm>
 #include <cstring>
@@ -539,5 +539,5 @@ private:
 };
 }
 
-#endif //FLANN_RESULTSET_H
+#endif //OPENCV_FLANN_RESULTSET_H
 

diff --git a/modules/flann/include/opencv2/flann/timer.h b/modules/flann/include/opencv2/flann/timer.h
index a06c5c0..107371e 100644 (file)
--- a/modules/flann/include/opencv2/flann/timer.h
+++ b/modules/flann/include/opencv2/flann/timer.h
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef FLANN_TIMER_H
-#define FLANN_TIMER_H
+#ifndef OPENCV_FLANN_TIMER_H
+#define OPENCV_FLANN_TIMER_H
 
 #include <time.h>