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;

3rdparty/flann/flann.cpp

@@ -58,7 +58,7 @@ using namespace std;
 #endif
 
 
-namespace flann
+namespace cvflann
 {
 
 typedef ObjectFactory<IndexParams, flann_algorithm_t> ParamsFactory;
@@ -224,7 +224,7 @@ int hierarchicalClustering(const Matrix<float>& features, Matrix<float>& centers
 
 
 
-using namespace flann;
+using namespace cvflann;
 
 typedef NNIndex* NNIndexPtr;
 typedef Matrix<float>* MatrixPtr;

3rdparty/flann/flann.hpp

@@ -40,7 +40,7 @@
 
 #include "flann.h"
 
-namespace flann
+namespace cvflann
 {
 
 class NNIndex;

3rdparty/flann/nn/ground_truth.h

@@ -34,7 +34,7 @@
 #include "matrix.h"
 #include "dist.h"
 
-namespace flann
+namespace cvflann
 {
 
 template <typename T>

3rdparty/flann/nn/index_testing.cpp

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-namespace flann
+namespace cvflann
 {
 
 const float SEARCH_EPS = 0.001f;

3rdparty/flann/nn/index_testing.h

@@ -38,7 +38,7 @@
 
 using namespace std;
 
-namespace flann
+namespace cvflann
 {
 
 void search_for_neighbors(NNIndex& index, const Matrix<float>& testset, Matrix<int>& result, Matrix<float>& dists, const SearchParams &searchParams, int skip = 0);

3rdparty/flann/nn/simplex_downhill.h

@@ -31,7 +31,7 @@
 #ifndef SIMPLEX_DOWNHILL_H
 #define SIMPLEX_DOWNHILL_H
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/util/allocator.h

@@ -35,7 +35,7 @@
 #include <stdio.h>
 
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/util/common.h

@@ -36,7 +36,7 @@
 
 #include <stdexcept>
 
-namespace flann
+namespace cvflann
 {
 class FLANNException : public std::runtime_error {
  public:

3rdparty/flann/util/heap.h

@@ -35,7 +35,7 @@
 #include <algorithm>
 using namespace std;
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/util/logger.cpp

@@ -36,7 +36,7 @@
 
 using namespace std;
 
-namespace flann
+namespace cvflann
 {
 
 Logger logger;

3rdparty/flann/util/logger.h

@@ -39,7 +39,7 @@
 
 using namespace std;
 
-namespace flann
+namespace cvflann
 {
 
 class Logger

3rdparty/flann/util/matrix.h

@@ -35,7 +35,7 @@
 #include <random.h>
 
 
-namespace flann
+namespace cvflann
 {
 /**
 * Class implementing a generic rectangular dataset.

3rdparty/flann/util/object_factory.h

@@ -33,7 +33,7 @@
 
 #include <map>
 
-namespace flann
+namespace cvflann
 {
 
 template<typename BaseClass, typename DerivedClass>

3rdparty/flann/util/random.cpp

@@ -31,7 +31,7 @@
 #include "random.h"
 
 
-namespace flann
+namespace cvflann
 {
 
 void seed_random(unsigned int seed)

3rdparty/flann/util/random.h

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

3rdparty/flann/util/result_set.h

@@ -40,7 +40,7 @@
 using namespace std;
 
 
-namespace flann
+namespace cvflann
 {
 
 /* This record represents a branch point when finding neighbors in

3rdparty/flann/util/saving.cpp

@@ -33,7 +33,7 @@
 #include "nn_index.h"
 #include <cstdio>
 
-namespace flann
+namespace cvflann
 {
 
 const char FLANN_SIGNATURE[] = "FLANN_INDEX";

3rdparty/flann/util/saving.h

@@ -35,7 +35,7 @@
 #include "nn_index.h"
 
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/flann/util/timer.h

@@ -34,7 +34,7 @@
 #include <time.h>
 
 
-namespace flann
+namespace cvflann
 {
 
 /**

3rdparty/include/flann/common.h

@@ -36,7 +36,7 @@
 
 #include <stdexcept>
 
-namespace flann
+namespace cvflann
 {
 class FLANNException : public std::runtime_error {
  public:

3rdparty/include/flann/flann.hpp

@@ -40,7 +40,7 @@
 
 #include "flann.h"
 
-namespace flann
+namespace cvflann
 {
 
 class NNIndex;

3rdparty/include/flann/matrix.h

@@ -35,7 +35,7 @@
 #include "random.h"
 
 
-namespace flann
+namespace cvflann
 {
 /**
 * Class implementing a generic rectangular dataset.

3rdparty/include/flann/random.h

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