mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 04:12:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20676 from AleksandrPanov:delete_createConvexHull_convertTo

Browse Source 
* deleted dublicated createConvexHull and convertTo

* replaced checkVector(2) with points.empty()
This commit is contained in:
Alexander Panov 2021-09-13 19:27:00 +03:00 committed by GitHub
parent 1e3be09b3b
commit 1618c963e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/imgproc/src/min_enclosing_triangle.cpp
View File

@ -129,7 +129,6 @@ static bool areOnTheSameSideOfLine(const cv::Point2f &p1, const cv::Point2f &p2,
static double areaOfTriangle(const cv::Point2f &a, const cv::Point2f &b, const cv::Point2f &c);
static void createConvexHull(cv::InputArray points, std::vector<cv::Point2f> &polygon);
static double distanceBtwPoints(const cv::Point2f &a, const cv::Point2f &b);
@ -319,29 +318,12 @@ namespace minEnclosingTriangle {
static void findMinEnclosingTriangle(cv::InputArray points,
CV_OUT cv::OutputArray triangle, CV_OUT double &area) {
std::vector<cv::Point2f> resultingTriangle, polygon;
createConvexHull(points, polygon);
CV_Assert(!points.empty());
convexHull(points, polygon, true, true);
findMinEnclosingTriangle(polygon, resultingTriangle, area);
cv::Mat(resultingTriangle).copyTo(triangle);
}
//! Create the convex hull of the given set of points
/*!
* @param points The provided set of points
* @param polygon The polygon representing the convex hull of the points
*/
static void createConvexHull(cv::InputArray points, std::vector<cv::Point2f> &polygon) {
cv::Mat pointsMat = points.getMat();
std::vector<cv::Point2f> pointsVector;
CV_Assert((pointsMat.checkVector(2) > 0) &&
((pointsMat.depth() == CV_32F) || (pointsMat.depth() == CV_32S)));
pointsMat.convertTo(pointsVector, CV_32F);
convexHull(pointsVector, polygon, true, true);
}
//! Find the minimum enclosing triangle and its area
/*!
* The overall complexity of the algorithm is theta(n) where "n" represents the number