Commit 2fed6683 authored by Roman Donchenko's avatar Roman Donchenko

Fixed build errors.

parent 920fd482
...@@ -968,14 +968,14 @@ void cv::ocl::BruteForceMatcher_OCL_base::knnMatch(const oclMat &query, std::vec ...@@ -968,14 +968,14 @@ void cv::ocl::BruteForceMatcher_OCL_base::knnMatch(const oclMat &query, std::vec
std::vector<DMatch> &localMatch = curMatches[queryIdx]; std::vector<DMatch> &localMatch = curMatches[queryIdx];
std::vector<DMatch> &globalMatch = matches[queryIdx]; std::vector<DMatch> &globalMatch = matches[queryIdx];
for_each(localMatch.begin(), localMatch.end(), ImgIdxSetter(static_cast<int>(imgIdx))); std::for_each(localMatch.begin(), localMatch.end(), ImgIdxSetter(static_cast<int>(imgIdx)));
temp.clear(); temp.clear();
merge(globalMatch.begin(), globalMatch.end(), localMatch.begin(), localMatch.end(), back_inserter(temp)); std::merge(globalMatch.begin(), globalMatch.end(), localMatch.begin(), localMatch.end(), back_inserter(temp));
globalMatch.clear(); globalMatch.clear();
const size_t count = std::min((size_t)k, temp.size()); const size_t count = std::min((size_t)k, temp.size());
copy(temp.begin(), temp.begin() + count, back_inserter(globalMatch)); std::copy(temp.begin(), temp.begin() + count, back_inserter(globalMatch));
} }
} }
......
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