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

moved flannIndex to protected section again

Browse Source
This commit is contained in:
Maria Dimashova 2011-02-02 15:47:08 +00:00
parent 5cc7d858ad
commit 8d36926271
1 changed files with 1 additions and 2 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,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;