From 2c5de6dd5965b129f538ea9a963e5e008a0edea7 Mon Sep 17 00:00:00 2001 From: Marius Muja Date: Wed, 23 Nov 2011 22:01:06 +0000 Subject: [PATCH] Fix ticket #1346 --- modules/flann/include/opencv2/flann/flann.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/flann/include/opencv2/flann/flann.hpp b/modules/flann/include/opencv2/flann/flann.hpp index 988988f28..ff19f623d 100644 --- a/modules/flann/include/opencv2/flann/flann.hpp +++ b/modules/flann/include/opencv2/flann/flann.hpp @@ -374,7 +374,7 @@ int Index_::radiusSearch(const Mat& query, Mat& indices, Mat& dists, Distance template -int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::IndexParams& params, +int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::KMeansIndexParams& params, Distance d = Distance()) { typedef typename Distance::ElementType ElementType; @@ -393,7 +393,7 @@ int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::I template -FLANN_DEPRECATED int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::IndexParams& params) +FLANN_DEPRECATED int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::KMeansIndexParams& params) { printf("[WARNING] cv::flann::hierarchicalClustering is deprecated, use " "cv::flann::hierarchicalClustering instead\n");