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

Merge pull request #11286 from sturkmen72:update_rectangle

Browse Source
This commit is contained in:
Alexander Alekhin 2018-04-13 13:38:49 +00:00
commit 7e5581cd86
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -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 use `rec` parameter as alternative specification of the drawn rectangle: `r.tl() and
r.br()-Point(1,1)` are opposite corners 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, const Scalar& color, int thickness = 1,
int lineType = LINE_8, int shift = 0); 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 line_type Type of the line, See #LineTypes
@param markerSize The length of the marker axis [default = 20 pixels] @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 markerType = MARKER_CROSS, int markerSize=20, int thickness=1,
int line_type=8); int line_type=8);

5
modules/imgproc/src/drawing.cpp
View File

@ -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 */ /* 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) 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, const Scalar& color, int thickness,
int lineType, int shift ) int lineType, int shift )
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
CV_Assert( 0 <= shift && shift <= XY_SHIFT );
if( rec.area() > 0 ) if( rec.area() > 0 )
rectangle( img, rec.tl(), rec.br() - Point(1<<shift,1<<shift), rectangle( img, rec.tl(), rec.br() - Point(1<<shift,1<<shift),
color, thickness, lineType, shift ); color, thickness, lineType, shift );