moved flannIndex to protected section again

8d369262 · Maria Dimashova · 5cc7d858 · 8d369262
Commit 8d369262 authored Feb 02, 2011 by Maria Dimashova
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

features2d.hpp modules/features2d/include/opencv2/features2d/features2d.hpp +1 -2

No files found.
--- 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;