potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

fixed collisions between std::transform() and cv::transform() (#781)

Browse Source
This commit is contained in:
Maria Dimashova
2011-01-12 06:39:08 +00:00
parent 358b061ade
commit 655120febc
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/include/opencv2/features2d/features2d.hpp
+2 -2
View File
@@ -2075,8 +2075,8 @@ Ptr<DescriptorMatcher> BruteForceMatcher<Distance>::clone( bool emptyTrainData )
BruteForceMatcher* matcher = new BruteForceMatcher(distance);
if( !emptyTrainData )
{
transform( trainDescCollection.begin(), trainDescCollection.end(),
matcher->trainDescCollection.begin(), clone_op );
std::transform( trainDescCollection.begin(), trainDescCollection.end(),
matcher->trainDescCollection.begin(), clone_op );
}
return matcher;
}