moved flannIndex to public section (temporarily)
authorMaria Dimashova <no@email>
Tue, 1 Feb 2011 17:38:11 +0000 (17:38 +0000)
committerMaria Dimashova <no@email>
Tue, 1 Feb 2011 17:38:11 +0000 (17:38 +0000)
modules/features2d/include/opencv2/features2d/features2d.hpp

index ee9362f..47d3c57 100644 (file)
@@ -2273,6 +2273,7 @@ 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,
@@ -2285,7 +2286,7 @@ protected:
 
     Ptr<flann::IndexParams> indexParams;
     Ptr<flann::SearchParams> searchParams;
-    Ptr<flann::Index> flannIndex;
+    //Ptr<flann::Index> flannIndex;
 
     DescriptorCollection mergedDescriptors;
     int addedDescCount;