fixed SURF::operator() (#423)

2010-11-11 16:06:22 +00:00
parent b12588f702
commit cb3711d51d
1 changed files with 3 additions and 1 deletions
--- 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();