mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
Merge pull request #21942 from pglotov:add-blob-contours
added blob contours to blob detector * added blob contours * Fixed Java regression test after new parameter addition to SimpleBlobDetector. * Added stub implementation of SimpleBlobDetector::getBlobContours to presume source API compatibility.
This commit is contained in:
@@ -107,6 +107,10 @@ public:
|
||||
* Remove keypoints from some image by mask for pixels of this image.
|
||||
*/
|
||||
static void runByPixelsMask( std::vector<KeyPoint>& keypoints, const Mat& mask );
|
||||
/*
|
||||
* Remove objects from some image and a vector of points by mask for pixels of this image
|
||||
*/
|
||||
static void runByPixelsMask2VectorPoint(std::vector<KeyPoint> &keypoints, std::vector<std::vector<Point> > &removeFrom, const Mat &mask);
|
||||
/*
|
||||
* Remove duplicated keypoints.
|
||||
*/
|
||||
@@ -719,6 +723,8 @@ public:
|
||||
CV_PROP_RW bool filterByConvexity;
|
||||
CV_PROP_RW float minConvexity, maxConvexity;
|
||||
|
||||
CV_PROP_RW bool collectContours;
|
||||
|
||||
void read( const FileNode& fn );
|
||||
void write( FileStorage& fs ) const;
|
||||
};
|
||||
@@ -726,6 +732,7 @@ public:
|
||||
CV_WRAP static Ptr<SimpleBlobDetector>
|
||||
create(const SimpleBlobDetector::Params ¶meters = SimpleBlobDetector::Params());
|
||||
CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
|
||||
CV_WRAP virtual const std::vector<std::vector<cv::Point> >& getBlobContours() const;
|
||||
};
|
||||
|
||||
//! @} features2d_main
|
||||
|
||||
Reference in New Issue
Block a user