Skip to content

deleted dublicated "private" createConvexHull and convertTo#20676

Merged
alalek merged 2 commits intoopencv:3.4from
AleksandrPanov:delete_createConvexHull_convertTo
Sep 13, 2021
Merged

deleted dublicated "private" createConvexHull and convertTo#20676
alalek merged 2 commits intoopencv:3.4from
AleksandrPanov:delete_createConvexHull_convertTo

Conversation

@AleksandrPanov
Copy link
Copy Markdown
Contributor

@AleksandrPanov AleksandrPanov commented Sep 8, 2021 •
edited
Loading

Fixes #17585
Function createConvexHull just cast cv::Mat to vector<cv::Point2f> by convertTo() and call ConvexHull.
There is problem: convertTo() can't cast cv::Mat(n, 2, CV_32FC1) to vector<cv::Point2f>. But ConvexHull can take cv::Mat(n, 2, CV_32FC1).
To fix problem can delete createConvexHull (this is "private" function and calls once).

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@AleksandrPanov AleksandrPanov force-pushed the delete_createConvexHull_convertTo branch from 77ef8ad to d16afe5 Compare September 9, 2021 09:19
alalek
alalek approved these changes Sep 9, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Thank you 👍

modules/imgproc/src/min_enclosing_triangle.cpp Outdated
std::vector<cv::Point2f> resultingTriangle, polygon;

createConvexHull(points, polygon);
CV_Assert(points.getMat().checkVector(2) > 0);
Copy link
Copy Markdown
Member

@alalek alalek Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets remove this check, because convexHull has similar checks inside through total = points.checkVector(2)

Or replace it with CV_Assert(!points.empty());

Copy link
Copy Markdown
Contributor Author

@AleksandrPanov AleksandrPanov Sep 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replaced CV_Assert(points.getMat().checkVector(2) > 0) with CV_Assert(!points.empty())

@AleksandrPanov AleksandrPanov force-pushed the delete_createConvexHull_convertTo branch from b68b9d6 to 6304344 Compare September 13, 2021 15:06
@alalek alalek merged commit 1618c96 into opencv:3.4 Sep 13, 2021
@AleksandrPanov AleksandrPanov mentioned this pull request Sep 15, 2021
Closed
@alalek alalek mentioned this pull request Sep 25, 2021
Merged
This was referenced Oct 15, 2021
Merged
Closed
@AleksandrPanov AleksandrPanov mentioned this pull request Oct 21, 2021
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: imgproc category: python bindings

Projects

None yet

Milestone

3.4.16

Development

Successfully merging this pull request may close these issues.

2 participants

@AleksandrPanov @alalek