moved flannIndex to protected section again

pull/13383/head
Maria Dimashova 14 years ago
parent 5cc7d858ad
commit 8d36926271
  1. 3
      modules/features2d/include/opencv2/features2d/features2d.hpp

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

Loading…
Cancel
Save