From 18067c8e9f4973a44807d44aec229ef3a75aad41 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 10 Apr 2012 08:27:39 +0000 Subject: [PATCH] Fixed flann deprecation warnings from flann itself --- modules/flann/include/opencv2/flann/flann.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/flann/include/opencv2/flann/flann.hpp b/modules/flann/include/opencv2/flann/flann.hpp index ff19f623d2..a01e1a84fa 100644 --- a/modules/flann/include/opencv2/flann/flann.hpp +++ b/modules/flann/include/opencv2/flann/flann.hpp @@ -225,7 +225,7 @@ int GenericIndex::radiusSearch(const Mat& query, Mat& indices, Mat& di * @deprecated Use GenericIndex class instead */ template -class FLANN_DEPRECATED Index_ { +class Index_ { public: typedef typename L2::ElementType ElementType; typedef typename L2::ResultType DistanceType; @@ -277,6 +277,8 @@ private: ::cvflann::Index< L1 >* nnIndex_L1; }; +template +class FLANN_DEPRECATED Index_; template Index_::Index_(const Mat& dataset, const ::cvflann::IndexParams& params)