Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892

12 years ago · 308c7f5f6e
parent aea96e98bb fc82150edc
commit 308c7f5f6e
1 changed files with 3 additions and 3 deletions
--- a/modules/nonfree/src/sift.cpp
+++ b/modules/nonfree/src/sift.cpp
@ -774,9 +774,6 @@ void SIFT::operator()(InputArray _image, InputArray _mask,
        findScaleSpaceExtrema(gpyr, dogpyr, keypoints);
        KeyPointsFilter::removeDuplicated( keypoints );

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