moved flannIndex to public section (temporarily)

This commit is contained in:
Maria Dimashova 2011-02-01 17:38:11 +00:00
parent da2d7ee72b
commit 3ae5a314e3

View File

@ -2273,6 +2273,7 @@ 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,
@ -2285,7 +2286,7 @@ protected:
Ptr<flann::IndexParams> indexParams;
Ptr<flann::SearchParams> searchParams;
Ptr<flann::Index> flannIndex;
//Ptr<flann::Index> flannIndex;
DescriptorCollection mergedDescriptors;
int addedDescCount;