projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da2d7ee
)
moved flannIndex to public section (temporarily)
author
Maria Dimashova
<no@email>
Tue, 1 Feb 2011 17:38:11 +0000
(17:38 +0000)
committer
Maria Dimashova
<no@email>
Tue, 1 Feb 2011 17:38:11 +0000
(17:38 +0000)
modules/features2d/include/opencv2/features2d/features2d.hpp
patch
|
blob
|
history
diff --git
a/modules/features2d/include/opencv2/features2d/features2d.hpp
b/modules/features2d/include/opencv2/features2d/features2d.hpp
index ee9362f1edfd3e0fd732d33beeff1ea61293e433..47d3c57698859eba36adb6f527b14f39b92da366 100644
(file)
--- a/
modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/
modules/features2d/include/opencv2/features2d/features2d.hpp
@@
-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;