fixed opencv_flann (with flann 1.6) compile errors on Windows (VS2005 & VS2008)

diff --git a/include/opencv2/opencv.hpp b/include/opencv2/opencv.hpp
index f338163..5935d63 100644 (file)
--- a/include/opencv2/opencv.hpp
+++ b/include/opencv2/opencv.hpp
@@ -45,7 +45,7 @@
 
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/core.hpp"
-#include "opencv2/flann/flann.hpp"
+#include "opencv2/flann/miniflann.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/video/video.hpp"

diff --git a/modules/flann/include/opencv2/flann/lsh_table.h b/modules/flann/include/opencv2/flann/lsh_table.h
index c74baab..f52d5bd 100644 (file)
--- a/modules/flann/include/opencv2/flann/lsh_table.h
+++ b/modules/flann/include/opencv2/flann/lsh_table.h
@@ -210,7 +210,7 @@ public:
             break;
         case kBitsetHash:
             // That means we can check the bitset for the presence of a key
-            if (key_bitset_.test(key)) return &buckets_space_.at(key);
+            if (key_bitset_.test(key)) return &buckets_space_.find(key)->second;
             else return 0;
             break;
         case kHash: