Skip to content

O
opencv
Commit 3ae5a314 authored by Maria Dimashova's avatar Maria Dimashova
Browse files
Options

moved flannIndex to public section (temporarily)

parent da2d7ee7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/features2d/include/opencv2/features2d/features2d.hpp
View file @ 3ae5a314
...@@ -2273,6 +2273,7 @@ public: ...@@ -2273,6 +2273,7 @@ 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,
...@@ -2285,7 +2286,7 @@ protected: ...@@ -2285,7 +2286,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