Merge pull request opencv#9503 from sovrasov:convex_hull_disable_inplace

alalek · alalek · commit 964dda2ef2ee · 2017-08-29T16:41:55.000Z
diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp
@@ -3977,6 +3977,8 @@ returns convex hull points. Otherwise, it returns indices of the convex hull poi
 output array is std::vector, the flag is ignored, and the output depends on the type of the
 vector: std::vector\<int\> implies returnPoints=false, std::vector\<Point\> implies
 returnPoints=true.
+
+@note `points` and `hull` should be different arrays, inplace processing isn't supported.
  */
 CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull,
                               bool clockwise = false, bool returnPoints = true );
diff --git a/modules/imgproc/src/convhull.cpp b/modules/imgproc/src/convhull.cpp
@@ -130,6 +130,7 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
 {
     CV_INSTRUMENT_REGION()
 
+    CV_Assert(_points.getObj() != _hull.getObj());
     Mat points = _points.getMat();
     int i, total = points.checkVector(2), depth = points.depth(), nout = 0;
     int miny_ind = 0, maxy_ind = 0;

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret`
`130`	`130`	`{`
`131`	`131`	`CV_INSTRUMENT_REGION()`
`132`	`132`
	`133`	`+ CV_Assert(_points.getObj() != _hull.getObj());`
`133`	`134`	`Mat points = _points.getMat();`
`134`	`135`	`int i, total = points.checkVector(2), depth = points.depth(), nout = 0;`
`135`	`136`	`int miny_ind = 0, maxy_ind = 0;`