renamed cv::flann to cv::cvflann to avoid name conflicts

3rdparty/flann/algorithms/autotuned_index.h

@@ -36,7 +36,7 @@
 #include "ground_truth.h"
 #include "index_testing.h"
 
-namespace flann
+namespace cvflann
 {
 
 class AutotunedIndex : public NNIndex

3rdparty/flann/algorithms/composite_index.h

@@ -34,7 +34,7 @@
 #include "constants.h"
 #include "nn_index.h"
 
-namespace flann
+namespace cvflann
 {
 
 class CompositeIndex : public NNIndex

3rdparty/flann/algorithms/dist.cpp

@@ -30,7 +30,7 @@
 
 #include "dist.h"
 
-namespace flann
+namespace cvflann
 {
 
 /** Global variable indicating the distance metric

3rdparty/flann/algorithms/dist.h

@@ -36,7 +36,7 @@ using namespace std;
 
 #include "constants.h"
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/algorithms/kdtree_index.h

@@ -48,7 +48,7 @@
 using namespace std;
 
 
-namespace flann
+namespace cvflann
 {
 
 

3rdparty/flann/algorithms/kmeans_index.h

@@ -50,7 +50,7 @@
 using namespace std;
 
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/algorithms/linear_index.h

@@ -34,7 +34,7 @@
 #include "constants.h"
 #include "nn_index.h"
 
-namespace flann
+namespace cvflann
 {
 
 class LinearIndex : public NNIndex {

3rdparty/flann/algorithms/nn_index.h

@@ -41,7 +41,7 @@
 
 using namespace std;
 
-namespace flann
+namespace cvflann
 {
 
 class ResultSet;