Merge pull request opencv#5312 from sturkmen72:patch-2

vpisarev · vpisarev · commit 666de1b087b7 · 2015-09-09T10:30:22.000Z
diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp
@@ -1748,7 +1748,7 @@ void circle( InputOutputArray _img, Point center, int radius,
     double buf[4];
     scalarToRawData(color, buf, img.type(), 0);
 
-    if( thickness > 1 || line_type >= CV_AA )
+    if( thickness > 1 || line_type >= CV_AA || shift > 0 )
     {
         center.x <<= XY_SHIFT - shift;
         center.y <<= XY_SHIFT - shift;

Original file line number	Diff line number	Diff line change
`@@ -1748,7 +1748,7 @@ void circle( InputOutputArray _img, Point center, int radius,`
`1748`	`1748`	`double buf[4];`
`1749`	`1749`	`scalarToRawData(color, buf, img.type(), 0);`
`1750`	`1750`
`1751`		`- if( thickness > 1 \|\| line_type >= CV_AA )`
	`1751`	`+ if( thickness > 1 \|\| line_type >= CV_AA \|\| shift > 0 )`
`1752`	`1752`	`{`
`1753`	`1753`	`center.x <<= XY_SHIFT - shift;`
`1754`	`1754`	`center.y <<= XY_SHIFT - shift;`