OpenCV-transform.diff
| modules/features2d/src/matchers.cpp 2011-02-15 01:12:08.075336534 +0100 | ||
|---|---|---|
| 566 | 566 |
//matcher->flannIndex; |
| 567 | 567 |
matcher->addedDescCount = addedDescCount; |
| 568 | 568 |
matcher->mergedDescriptors = DescriptorCollection( mergedDescriptors ); |
| 569 |
transform( trainDescCollection.begin(), trainDescCollection.end(), |
|
| 569 |
std::transform( trainDescCollection.begin(), trainDescCollection.end(),
|
|
| 570 | 570 |
matcher->trainDescCollection.begin(), clone_op ); |
| 571 | 571 |
} |
| 572 | 572 |
return matcher; |
| ... | ... | |
| 631 | 631 |
{
|
| 632 | 632 |
pointCount = collection.pointCount; |
| 633 | 633 | |
| 634 |
transform( collection.images.begin(), collection.images.end(), images.begin(), clone_op ); |
|
| 634 |
std::transform( collection.images.begin(), collection.images.end(), images.begin(), clone_op );
|
|
| 635 | 635 | |
| 636 | 636 |
keypoints.resize( collection.keypoints.size() ); |
| 637 | 637 |
for( size_t i = 0; i < keypoints.size(); i++ ) |
| 638 |
-- modules/features2d/include/opencv2/features2d/features2d.hpp.orig 2011-02-15 01:13:20.900467130 +0100
|
|
| 638 |
++ modules/features2d/include/opencv2/features2d/features2d.hpp 2011-02-15 01:13:33.638144017 +0100
|
|
| ... | ... | |
| 2076 | 2076 |
BruteForceMatcher* matcher = new BruteForceMatcher(distance); |
| 2077 | 2077 |
if( !emptyTrainData ) |
| 2078 | 2078 |
{
|
| 2079 |
transform( trainDescCollection.begin(), trainDescCollection.end(), |
|
| 2079 |
std::transform( trainDescCollection.begin(), trainDescCollection.end(),
|
|
| 2080 | 2080 |
matcher->trainDescCollection.begin(), clone_op ); |
| 2081 | 2081 |
} |
| 2082 | 2082 |
return matcher; |