Fixed build errors.
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 27 Nov 2013 08:59:19 +0000 (12:59 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 27 Nov 2013 08:59:19 +0000 (12:59 +0400)
modules/ocl/src/brute_force_matcher.cpp

index 476f10d..d0e0932 100644 (file)
@@ -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> &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();
-                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();
                 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));
             }
         }