generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved flannIndex to public section (temporarily)

Browse Source
This commit is contained in:
Maria Dimashova 2011-02-01 17:38:11 +00:00
parent da2d7ee72b
commit 3ae5a314e3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -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:
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;