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

diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 59c2ac5..c7c91a1 100644 (file)
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -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;
 }

diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp
index 873accf..2bc4ced 100755 (executable)
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@@ -45,8 +45,6 @@
 #include <Eigen/Array>
 #endif
 
-using namespace std;
-
 namespace cv
 {
 
@@ -566,8 +564,8 @@ Ptr<DescriptorMatcher> FlannBasedMatcher::clone( bool emptyTrainData ) const
         //matcher->flannIndex;
         matcher->addedDescCount = addedDescCount;
         matcher->mergedDescriptors = DescriptorCollection( mergedDescriptors );
-        transform( trainDescCollection.begin(), trainDescCollection.end(),
-                   matcher->trainDescCollection.begin(), clone_op );
+        std::transform( trainDescCollection.begin(), trainDescCollection.end(),
+                        matcher->trainDescCollection.begin(), clone_op );
     }
     return matcher;
 }
@@ -631,7 +629,7 @@ GenericDescriptorMatcher::KeyPointCollection::KeyPointCollection( const KeyPoint
 {
     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() );
     for( size_t i = 0; i < keypoints.size(); i++ )