Commit 2c5de6dd authored by Marius Muja's avatar Marius Muja

Fix ticket #1346

parent 45d36ee0
...@@ -374,7 +374,7 @@ int Index_<T>::radiusSearch(const Mat& query, Mat& indices, Mat& dists, Distance ...@@ -374,7 +374,7 @@ int Index_<T>::radiusSearch(const Mat& query, Mat& indices, Mat& dists, Distance
template <typename Distance> template <typename Distance>
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()) Distance d = Distance())
{ {
typedef typename Distance::ElementType ElementType; typedef typename Distance::ElementType ElementType;
...@@ -393,7 +393,7 @@ int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::I ...@@ -393,7 +393,7 @@ int hierarchicalClustering(const Mat& features, Mat& centers, const ::cvflann::I
template <typename ELEM_TYPE, typename DIST_TYPE> template <typename ELEM_TYPE, typename DIST_TYPE>
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<ELEM_TYPE,DIST_TYPE> is deprecated, use " printf("[WARNING] cv::flann::hierarchicalClustering<ELEM_TYPE,DIST_TYPE> is deprecated, use "
"cv::flann::hierarchicalClustering<Distance> instead\n"); "cv::flann::hierarchicalClustering<Distance> instead\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment