[Bug 16465] libgraphics: Correct scaling for ellipses.

peter-b · peter-b · commit 0c879aabc9db · 2015-11-25T15:48:04.000Z
Remove correction factor from canvas module implementation.
diff --git a/engine/src/module-canvas.cpp b/engine/src/module-canvas.cpp
@@ -3380,7 +3380,7 @@ void MCCanvasPathMakeWithEllipse(MCCanvasPointRef p_center, MCCanvasFloat p_radi
 	if (!MCGPathCreateMutable(t_path))
 		return;
 	
-	MCGPathAddEllipse(t_path, *MCCanvasPointGet(p_center), MCGSizeMake(2*p_radius_x, 2*p_radius_y), 0);
+	MCGPathAddEllipse(t_path, *MCCanvasPointGet(p_center), MCGSizeMake(p_radius_x, p_radius_y), 0);
 	if (MCGPathIsValid(t_path))
 		MCCanvasPathMakeWithMCGPath(t_path, r_path);
 	
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -457,8 +457,8 @@ void MCGPathAddEllipse(MCGPathRef self, MCGPoint p_center, MCGSize p_radii, MCGF
 		{
 			// Use Skia implementation
 			SkRect t_bounds;
-			t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - (p_radii . width * 0.5f)), MCGCoordToSkCoord(p_center . y - (p_radii . height * 0.5f)),
-										MCGFloatToSkScalar(p_radii . width), MCGFloatToSkScalar(p_radii . height));
+			t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - p_radii . width), MCGCoordToSkCoord(p_center . y - p_radii . height),
+										MCGFloatToSkScalar(p_radii . width * 2), MCGFloatToSkScalar(p_radii . height * 2));
 			self -> path -> addOval(t_bounds);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -457,8 +457,8 @@ void MCGPathAddEllipse(MCGPathRef self, MCGPoint p_center, MCGSize p_radii, MCGF`
`457`	`457`	`{`
`458`	`458`	`// Use Skia implementation`
`459`	`459`	`SkRect t_bounds;`
`460`		`- t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - (p_radii . width * 0.5f)), MCGCoordToSkCoord(p_center . y - (p_radii . height * 0.5f)),`
`461`		`- MCGFloatToSkScalar(p_radii . width), MCGFloatToSkScalar(p_radii . height));`
	`460`	`+ t_bounds = SkRect::MakeXYWH(MCGCoordToSkCoord(p_center . x - p_radii . width), MCGCoordToSkCoord(p_center . y - p_radii . height),`
	`461`	`+ MCGFloatToSkScalar(p_radii . width * 2), MCGFloatToSkScalar(p_radii . height * 2));`
`462`	`462`	`self -> path -> addOval(t_bounds);`
`463`	`463`	`}`
`464`	`464`	`}`