| 183 |
183 |
{
|
| 184 |
184 |
if( borderSize > 0)
|
| 185 |
185 |
{
|
| 186 |
|
keypoints.erase( remove_if(keypoints.begin(), keypoints.end(),
|
|
186 |
keypoints.erase( std::remove_if(keypoints.begin(), keypoints.end(),
|
| 187 |
187 |
RoiPredicate(Rect(Point(borderSize, borderSize),
|
| 188 |
188 |
Point(imageSize.width - borderSize, imageSize.height - borderSize)))),
|
| 189 |
189 |
keypoints.end() );
|
| ... | ... | |
| 210 |
210 |
CV_Assert( maxSize >= 0);
|
| 211 |
211 |
CV_Assert( minSize <= maxSize );
|
| 212 |
212 |
|
| 213 |
|
keypoints.erase( remove_if(keypoints.begin(), keypoints.end(), SizePredicate(minSize, maxSize)),
|
|
213 |
keypoints.erase( std::remove_if(keypoints.begin(), keypoints.end(), SizePredicate(minSize, maxSize)),
|
| 214 |
214 |
keypoints.end() );
|
| 215 |
215 |
}
|
| 216 |
216 |
|
| ... | ... | |
| 232 |
232 |
if( mask.empty() )
|
| 233 |
233 |
return;
|
| 234 |
234 |
|
| 235 |
|
keypoints.erase(remove_if(keypoints.begin(), keypoints.end(), MaskPredicate(mask)), keypoints.end());
|
|
235 |
keypoints.erase(std::remove_if(keypoints.begin(), keypoints.end(), MaskPredicate(mask)), keypoints.end());
|
| 236 |
236 |
}
|
| 237 |
237 |
|
| 238 |
238 |
struct KeyPoint_LessThan
|
| 239 |
|
-- modules/features2d/src/matchers.cpp.orig Tue Feb 7 21:00:25 2012
|
|
239 |
++ modules/features2d/src/matchers.cpp Tue Feb 7 21:01:30 2012
|
| ... | ... | |
| 76 |
76 |
DescriptorMatcher::DescriptorCollection::DescriptorCollection( const DescriptorCollection& collection )
|
| 77 |
77 |
{
|
| 78 |
78 |
mergedDescriptors = collection.mergedDescriptors.clone();
|
| 79 |
|
copy( collection.startIdxs.begin(), collection.startIdxs.begin(), startIdxs.begin() );
|
|
79 |
std::copy( collection.startIdxs.begin(), collection.startIdxs.begin(), startIdxs.begin() );
|
| 80 |
80 |
}
|
| 81 |
81 |
|
| 82 |
82 |
DescriptorMatcher::DescriptorCollection::~DescriptorCollection()
|
| ... | ... | |
| 853 |
853 |
|
| 854 |
854 |
keypoints.resize( collection.keypoints.size() );
|
| 855 |
855 |
for( size_t i = 0; i < keypoints.size(); i++ )
|
| 856 |
|
copy( collection.keypoints[i].begin(), collection.keypoints[i].end(), keypoints[i].begin() );
|
|
856 |
std::copy( collection.keypoints[i].begin(), collection.keypoints[i].end(), keypoints[i].begin() );
|
| 857 |
857 |
|
| 858 |
|
copy( collection.startIndices.begin(), collection.startIndices.end(), startIndices.begin() );
|
|
858 |
std::copy( collection.startIndices.begin(), collection.startIndices.end(), startIndices.begin() );
|
| 859 |
859 |
}
|
| 860 |
860 |
|
| 861 |
861 |
void GenericDescriptorMatcher::KeyPointCollection::add( const vector<Mat>& _images,
|