Mono.Cairo: Fix rectangles returned by StrokeExtents and FillExtents

The third and fourth parameters of the Rectangle constructor are width
and height, but cairo_stroke_extents and cairo_fill_extents give right
and bottom coordinates.

Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Conflicts:
	mcs/class/Mono.Cairo/Mono.Cairo/Context.cs

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
index 65a3d411b5d8575e1de24cc2bca5f8de43829100..699c079cf2df242e03356611603f8cdabcca94fa 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
@@ -477,7 +477,7 @@ namespace Cairo {
                {
                        double x1, y1, x2, y2;
                        NativeMethods.cairo_stroke_extents (handle, out x1, out y1, out x2, out y2);
-                       return new Rectangle (x1, y1, x2, y2);
+                       return new Rectangle (x1, y1, x2 - x1, y2 - y1);
                }
 
                public void Fill ()
@@ -489,7 +489,7 @@ namespace Cairo {
                {
                        double x1, y1, x2, y2;
                        NativeMethods.cairo_fill_extents (handle, out x1, out y1, out x2, out y2);
-                       return new Rectangle (x1, y1, x2, y2);
+                       return new Rectangle (x1, y1, x2 - x1, y2 - y1);
                }
 
                public void FillPreserve ()