mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10549 from Sahloul:bug_fix/FLANN

Browse Source
This commit is contained in:
Alexander Alekhin 2018-01-10 11:39:47 +00:00
commit b6075e11b8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/flann/src/miniflann.cpp
View File

@ -482,6 +482,9 @@ void runKnnSearch_(void* index, const Mat& query, Mat& indices, Mat& dists,
typedef typename Distance::ResultType DistanceType; typedef typename Distance::ResultType DistanceType;
int type = DataType<ElementType>::type; int type = DataType<ElementType>::type;
int dtype = DataType<DistanceType>::type; int dtype = DataType<DistanceType>::type;
IndexType* index_ = (IndexType*)index;
CV_Assert((size_t)knn <= index_->size());
CV_Assert(query.type() == type && indices.type() == CV_32S && dists.type() == dtype); CV_Assert(query.type() == type && indices.type() == CV_32S && dists.type() == dtype);
CV_Assert(query.isContinuous() && indices.isContinuous() && dists.isContinuous()); CV_Assert(query.isContinuous() && indices.isContinuous() && dists.isContinuous());
@ -489,8 +492,8 @@ void runKnnSearch_(void* index, const Mat& query, Mat& indices, Mat& dists,
::cvflann::Matrix<int> _indices(indices.ptr<int>(), indices.rows, indices.cols); ::cvflann::Matrix<int> _indices(indices.ptr<int>(), indices.rows, indices.cols);
::cvflann::Matrix<DistanceType> _dists(dists.ptr<DistanceType>(), dists.rows, dists.cols); ::cvflann::Matrix<DistanceType> _dists(dists.ptr<DistanceType>(), dists.rows, dists.cols);
((IndexType*)index)->knnSearch(_query, _indices, _dists, knn, index_->knnSearch(_query, _indices, _dists, knn,
(const ::cvflann::SearchParams&)get_params(params)); (const ::cvflann::SearchParams&)get_params(params));
} }
template<typename Distance> template<typename Distance>