Merge pull request #10695 from mworchel:blobdetector_mask

Add mask support to SimpleBlobDetector

modules/features2d/src/blobdetector.cpp

@@ -272,9 +272,8 @@ void SimpleBlobDetector::findBlobs(const cv::Mat &image, const cv::Mat &binaryIm
 #endif
 }
 
-void SimpleBlobDetector::detectImpl(const cv::Mat& image, std::vector<cv::KeyPoint>& keypoints, const cv::Mat&) const
+void SimpleBlobDetector::detectImpl(const cv::Mat& image, std::vector<cv::KeyPoint>& keypoints, const cv::Mat& mask) const
 {
-    //TODO: support mask
     keypoints.clear();
     Mat grayscaleImage;
     if (image.channels() == 3)
@@ -355,6 +354,11 @@ void SimpleBlobDetector::detectImpl(const cv::Mat& image, std::vector<cv::KeyPoi
         keypoints.push_back(kpt);
     }
 
+    if (!mask.empty())
+    {
+        KeyPointsFilter::runByPixelsMask(keypoints, mask);
+    }
+
 #ifdef DEBUG_BLOB_DETECTOR
     namedWindow("keypoints", CV_WINDOW_NORMAL);
     Mat outImg = image.clone();