From: Ivan Korolev <ivan.korolev@itseez.com>
Date: Fri, 14 Jun 2013 04:21:42 +0000 (+0400)
Subject: Fixed a bug #2892
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~720^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc82150edc219dabf680561f26ae5c2bb8d3c040;p=profile%2Fivi%2Fopencv.git

Fixed a bug #2892
---

diff --git a/modules/nonfree/src/sift.cpp b/modules/nonfree/src/sift.cpp
index 58ebd31..5a7fd89 100644
--- 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
     {