From 3ae5a314e347b2f96f9618cb838a10a672340251 Mon Sep 17 00:00:00 2001
From: Maria Dimashova <no@email>
Date: Tue, 1 Feb 2011 17:38:11 +0000
Subject: [PATCH] moved flannIndex to public section (temporarily)
---
modules/features2d/include/opencv2/features2d/features2d.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index ee9362f1ed..47d3c57698 100644
--- 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;
--
2.18.0