potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages 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
parent 7ae83df8aa 8b6a6d4546
commit 7e5581cd86
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/drawing.cpp
+2 -3
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 */
/* ----------------------------------------------------------------------------------------- */
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<<shift,1<<shift),
color, thickness, lineType, shift );