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

Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.

Browse Source
This commit is contained in:
Ovidiu Parvu 2013-09-12 14:34:08 +01:00
parent 4fce8e6b0e
commit 9902affae6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,6 +273,8 @@ void cv::minEnclosingTriangle(cv::InputArray points,
CV_OUT cv::OutputArray triangle, CV_OUT double& area) { CV_OUT cv::OutputArray triangle, CV_OUT double& area) {
std::vector<cv::Point2f> resultingTriangle; std::vector<cv::Point2f> resultingTriangle;
CV_Assert(triangle.getMat().depth() == CV_32F);
createConvexHull(points); createConvexHull(points);
findMinEnclosingTriangle(resultingTriangle, area); findMinEnclosingTriangle(resultingTriangle, area);
copyResultingTriangle(resultingTriangle, triangle); copyResultingTriangle(resultingTriangle, triangle);
@ -288,11 +290,14 @@ void cv::minEnclosingTriangle(cv::InputArray points,
*/ */
static void createConvexHull(cv::InputArray points) { static void createConvexHull(cv::InputArray points) {
cv::Mat pointsMat = points.getMat(); cv::Mat pointsMat = points.getMat();
std::vector<cv::Point2f> pointsVector;
CV_Assert((pointsMat.checkVector(2) > 0) && CV_Assert((pointsMat.checkVector(2) > 0) &&
((pointsMat.depth() == CV_32F) || (pointsMat.depth() == CV_32S))); ((pointsMat.depth() == CV_32F) || (pointsMat.depth() == CV_32S)));
convexHull(points, polygon, true, true); pointsMat.convertTo(pointsVector, CV_32F);
convexHull(pointsVector, polygon, true, true);
} }
//! Find the minimum enclosing triangle and its area //! Find the minimum enclosing triangle and its area