Skip to content

O
opencv
Commit 8d369262 authored by Maria Dimashova's avatar Maria Dimashova
Browse files
Options

moved flannIndex to protected section again

parent 5cc7d858
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
modules/features2d/include/opencv2/features2d/features2d.hpp
View file @ 8d369262
...@@ -2273,7 +2273,6 @@ public: ...@@ -2273,7 +2273,6 @@ public:
virtual Ptr<DescriptorMatcher> clone( bool emptyTrainData=false ) const; virtual Ptr<DescriptorMatcher> clone( bool emptyTrainData=false ) const;
Ptr<flann::Index> flannIndex;
protected: protected:
static void convertToDMatches( const DescriptorCollection& descriptors, static void convertToDMatches( const DescriptorCollection& descriptors,
const Mat& indices, const Mat& distances, const Mat& indices, const Mat& distances,
...@@ -2286,7 +2285,7 @@ protected: ...@@ -2286,7 +2285,7 @@ protected:
Ptr<flann::IndexParams> indexParams; Ptr<flann::IndexParams> indexParams;
Ptr<flann::SearchParams> searchParams; Ptr<flann::SearchParams> searchParams;
//Ptr<flann::Index> flannIndex; Ptr<flann::Index> flannIndex;
DescriptorCollection mergedDescriptors; DescriptorCollection mergedDescriptors;
int addedDescCount; int addedDescCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment