generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request from ivan-korolev:fix_sift_bug_2892

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-14 13:50:01 +04:00 committed by OpenCV Buildbot
commit 308c7f5f6e
1 changed files with 3 additions and 3 deletions

6
modules/nonfree/src/sift.cpp

@ -774,9 +774,6 @@ void SIFT::operator()(InputArray _image, InputArray _mask,
findScaleSpaceExtrema(gpyr, dogpyr, keypoints); findScaleSpaceExtrema(gpyr, dogpyr, keypoints);
KeyPointsFilter::removeDuplicated( keypoints ); KeyPointsFilter::removeDuplicated( keypoints );
if( !mask.empty() )
KeyPointsFilter::runByPixelsMask( keypoints, mask );
if( nfeatures > 0 ) if( nfeatures > 0 )
KeyPointsFilter::retainBest(keypoints, nfeatures); KeyPointsFilter::retainBest(keypoints, nfeatures);
//t = (double)getTickCount() - t; //t = (double)getTickCount() - t;
@ -791,6 +788,9 @@ void SIFT::operator()(InputArray _image, InputArray _mask,
kpt.pt *= scale; kpt.pt *= scale;
kpt.size *= scale; kpt.size *= scale;
} }
if( !mask.empty() )
KeyPointsFilter::runByPixelsMask( keypoints, mask );
} }
else else
{ {