From 8d36926271de67a60026cd31cc0b5a06f345e4f5 Mon Sep 17 00:00:00 2001
From: Maria Dimashova <no@email>
Date: Wed, 2 Feb 2011 15:47:08 +0000
Subject: [PATCH] moved flannIndex to protected section again

---
 modules/features2d/include/opencv2/features2d/features2d.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 47d3c57..ee9362f 100644
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -2273,7 +2273,6 @@ public:
 	
     virtual Ptr<DescriptorMatcher> clone( bool emptyTrainData=false ) const;
 
-    Ptr<flann::Index> flannIndex;
 protected:
     static void convertToDMatches( const DescriptorCollection& descriptors,
                                    const Mat& indices, const Mat& distances,
@@ -2286,7 +2285,7 @@ protected:
 
     Ptr<flann::IndexParams> indexParams;
     Ptr<flann::SearchParams> searchParams;
-    //Ptr<flann::Index> flannIndex;
+    Ptr<flann::Index> flannIndex;
 
     DescriptorCollection mergedDescriptors;
     int addedDescCount;
-- 
2.7.4