Fix to solve conflicts to standalone FLANN

diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
index ca37487..b9b4e49 100644 (file)
--- a/modules/flann/include/opencv2/flann/any.h
+++ b/modules/flann/include/opencv2/flann/any.h
@@ -16,7 +16,7 @@
 #include <ostream>
 #include <typeinfo>
 
-namespace cdiggins
+namespace cvflann
 {
 
 namespace anyimpl

diff --git a/modules/flann/include/opencv2/flann/dynamic_bitset.h b/modules/flann/include/opencv2/flann/dynamic_bitset.h
index e88cfaa..064ec39 100644 (file)
--- a/modules/flann/include/opencv2/flann/dynamic_bitset.h
+++ b/modules/flann/include/opencv2/flann/dynamic_bitset.h
@@ -45,6 +45,8 @@ typedef boost::dynamic_bitset<> DynamicBitset;
 
 #include "dist.h"
 
+namespace cvflann {
+
 /** Class re-implementing the boost version of it
  * This helps not depending on boost, it also does not do the bound checks
  * and has a way to reset a block for speed
@@ -147,6 +149,8 @@ private:
     static const unsigned int cell_bit_size_ = CHAR_BIT * sizeof(size_t);
 };
 
+} // namespace cvflann
+
 #endif
 
 #endif // OPENCV_FLANN_DYNAMIC_BITSET_H_

diff --git a/modules/flann/include/opencv2/flann/params.h b/modules/flann/include/opencv2/flann/params.h
index 9f3a468..fc2a906 100644 (file)
--- a/modules/flann/include/opencv2/flann/params.h
+++ b/modules/flann/include/opencv2/flann/params.h
@@ -39,7 +39,6 @@
 namespace cvflann
 {
 
-typedef cdiggins::any any;
 typedef std::map<std::string, any> IndexParams;
 
 struct SearchParams : public IndexParams