Merge pull request opencv#10902 from alalek:port_10695

vpisarev · vpisarev · commit a0c2718adb66 · 2018-02-20T13:26:59.000Z
diff --git a/modules/features2d/src/blobdetector.cpp b/modules/features2d/src/blobdetector.cpp
@@ -304,11 +304,10 @@ void SimpleBlobDetectorImpl::findBlobs(InputArray _image, InputArray _binaryImag
 #endif
 }
 
-void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>& keypoints, InputArray)
+void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>& keypoints, InputArray mask)
 {
     CV_INSTRUMENT_REGION()
 
-    //TODO: support mask
     keypoints.clear();
     Mat grayscaleImage;
     if (image.channels() == 3 || image.channels() == 4)
@@ -372,6 +371,11 @@ void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>&
         KeyPoint kpt(sumPoint, (float)(centers[i][centers[i].size() / 2].radius) * 2.0f);
         keypoints.push_back(kpt);
     }
+
+    if (!mask.empty())
+    {
+        KeyPointsFilter::runByPixelsMask(keypoints, mask.getMat());
+    }
 }
 
 Ptr<SimpleBlobDetector> SimpleBlobDetector::create(const SimpleBlobDetector::Params& params)

Original file line number	Diff line number	Diff line change
`@@ -304,11 +304,10 @@ void SimpleBlobDetectorImpl::findBlobs(InputArray _image, InputArray _binaryImag`
`304`	`304`	`#endif`
`305`	`305`	`}`
`306`	`306`
`307`		`-void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>& keypoints, InputArray)`
	`307`	`+void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>& keypoints, InputArray mask)`
`308`	`308`	`{`
`309`	`309`	`CV_INSTRUMENT_REGION()`
`310`	`310`
`311`		`- //TODO: support mask`
`312`	`311`	`keypoints.clear();`
`313`	`312`	`Mat grayscaleImage;`
`314`	`313`	`if (image.channels() == 3 \|\| image.channels() == 4)`
`@@ -372,6 +371,11 @@ void SimpleBlobDetectorImpl::detect(InputArray image, std::vector<cv::KeyPoint>&`
`372`	`371`	`KeyPoint kpt(sumPoint, (float)(centers[i][centers[i].size() / 2].radius) * 2.0f);`
`373`	`372`	`keypoints.push_back(kpt);`
`374`	`373`	`}`
	`374`	`+`
	`375`	`+ if (!mask.empty())`
	`376`	`+ {`
	`377`	`+ KeyPointsFilter::runByPixelsMask(keypoints, mask.getMat());`
	`378`	`+ }`
`375`	`379`	`}`
`376`	`380`
`377`	`381`	`Ptr<SimpleBlobDetector> SimpleBlobDetector::create(const SimpleBlobDetector::Params& params)`