diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 75f009aa5f..85bb158f37 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -4400,7 +4400,7 @@ CV_EXPORTS_W void rectangle(InputOutputArray img, Point pt1, Point pt2, use `rec` parameter as alternative specification of the drawn rectangle: `r.tl() and r.br()-Point(1,1)` are opposite corners */ -CV_EXPORTS void rectangle(CV_IN_OUT Mat& img, Rect rec, +CV_EXPORTS_W void rectangle(InputOutputArray img, Rect rec, const Scalar& color, int thickness = 1, int lineType = LINE_8, int shift = 0); @@ -4494,7 +4494,7 @@ marker types are supported, see #MarkerTypes for more information. @param line_type Type of the line, See #LineTypes @param markerSize The length of the marker axis [default = 20 pixels] */ -CV_EXPORTS_W void drawMarker(CV_IN_OUT Mat& img, Point position, const Scalar& color, +CV_EXPORTS_W void drawMarker(InputOutputArray img, Point position, const Scalar& color, int markerType = MARKER_CROSS, int markerSize=20, int thickness=1, int line_type=8); diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp index 05a9150d77..81dd0e44f4 100644 --- a/modules/imgproc/src/drawing.cpp +++ b/modules/imgproc/src/drawing.cpp @@ -1737,7 +1737,7 @@ PolyLine( Mat& img, const Point2l* v, int count, bool is_closed, /* ADDING A SET OF PREDEFINED MARKERS WHICH COULD BE USED TO HIGHLIGHT POSITIONS IN AN IMAGE */ /* ----------------------------------------------------------------------------------------- */ -void drawMarker(Mat& img, Point position, const Scalar& color, int markerType, int markerSize, int thickness, int line_type) +void drawMarker(InputOutputArray img, Point position, const Scalar& color, int markerType, int markerSize, int thickness, int line_type) { switch(markerType) { @@ -1873,13 +1873,12 @@ void rectangle( InputOutputArray _img, Point pt1, Point pt2, } -void rectangle( Mat& img, Rect rec, +void rectangle( InputOutputArray img, Rect rec, const Scalar& color, int thickness, int lineType, int shift ) { CV_INSTRUMENT_REGION() - CV_Assert( 0 <= shift && shift <= XY_SHIFT ); if( rec.area() > 0 ) rectangle( img, rec.tl(), rec.br() - Point(1<