Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moved flannIndex to public section (temporarily)

Browse Source
pull/13383/head
Maria Dimashova 14 years ago
parent da2d7ee72b
commit 3ae5a314e3
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      modules/features2d/include/opencv2/features2d/features2d.hpp

3
modules/features2d/include/opencv2/features2d/features2d.hpp
Unescape 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;

Write Preview
Loading…
Cancel
Save