generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -2075,8 +2075,8 @@ Ptr<DescriptorMatcher> BruteForceMatcher<Distance>::clone( bool emptyTrainData )
BruteForceMatcher* matcher = new BruteForceMatcher(distance); BruteForceMatcher* matcher = new BruteForceMatcher(distance);
if( !emptyTrainData ) if( !emptyTrainData )
{ {
transform( trainDescCollection.begin(), trainDescCollection.end(), std::transform( trainDescCollection.begin(), trainDescCollection.end(),
matcher->trainDescCollection.begin(), clone_op ); matcher->trainDescCollection.begin(), clone_op );
} }
return matcher; return matcher;
} }

8
modules/features2d/src/matchers.cpp
View File

@ -45,8 +45,6 @@
#include <Eigen/Array> #include <Eigen/Array>
#endif #endif
using namespace std;
namespace cv namespace cv
{ {
@ -566,8 +564,8 @@ Ptr<DescriptorMatcher> FlannBasedMatcher::clone( bool emptyTrainData ) const
//matcher->flannIndex; //matcher->flannIndex;
matcher->addedDescCount = addedDescCount; matcher->addedDescCount = addedDescCount;
matcher->mergedDescriptors = DescriptorCollection( mergedDescriptors ); matcher->mergedDescriptors = DescriptorCollection( mergedDescriptors );
transform( trainDescCollection.begin(), trainDescCollection.end(), std::transform( trainDescCollection.begin(), trainDescCollection.end(),
matcher->trainDescCollection.begin(), clone_op ); matcher->trainDescCollection.begin(), clone_op );
} }
return matcher; return matcher;
} }
@ -631,7 +629,7 @@ GenericDescriptorMatcher::KeyPointCollection::KeyPointCollection( const KeyPoint
{ {
pointCount = collection.pointCount; pointCount = collection.pointCount;
transform( collection.images.begin(), collection.images.end(), images.begin(), clone_op ); std::transform( collection.images.begin(), collection.images.end(), images.begin(), clone_op );
keypoints.resize( collection.keypoints.size() ); keypoints.resize( collection.keypoints.size() );
for( size_t i = 0; i < keypoints.size(); i++ ) for( size_t i = 0; i < keypoints.size(); i++ )