fixed SURF::operator() (#423)

cb3711d5 · Maria Dimashova · b12588f7 · cb3711d5
Commit cb3711d5 authored Nov 11, 2010 by Maria Dimashova
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

surf.cpp modules/features2d/src/surf.cpp +3 -1

No files found.
--- a/modules/features2d/src/surf.cpp
+++ b/modules/features2d/src/surf.cpp
@@ -890,7 +890,9 @@ void SURF::operator()(const Mat& img, const Mat& mask,
    
    cvExtractSURF(&_img, pmask, &kp.seq, &d, storage,
        *(const CvSURFParams*)this, useProvidedKeypoints);
-    if( !useProvidedKeypoints )
+
+    // input keypoints can be filtered in cvExtractSURF()
+    if( !useProvidedKeypoints || (useProvidedKeypoints && keypoints.size() != kp.size()) )
    {
        Seq<CvSURFPoint>::iterator it = kp.begin();
        size_t i, n = kp.size();