|
|
@ -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++ ) |
|
|
|