* Mono.Cairo/Context.cs: Integrate Alp's patch to not use ref in

	the call to cairo_font_extents, but use out instead.

svn path=/trunk/mcs/; revision=81560

diff --git a/mcs/class/Mono.Cairo/ChangeLog b/mcs/class/Mono.Cairo/ChangeLog
index bce45c204246c3707d5457a353d73aa7f1f80cb5..fe72655172824cccc0cb9ea44b1ec32aaa9cf5f6 100644 (file)
--- a/mcs/class/Mono.Cairo/ChangeLog
+++ b/mcs/class/Mono.Cairo/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-07  Miguel de Icaza  <miguel@novell.com>
 
+       * Mono.Cairo/Context.cs: Integrate Alp's patch to not use ref in
+       the call to cairo_font_extents, but use out instead.
+
        * Integrate Alp's patch to rename CairoAPI NativeMethod, in
        accordance to 2.7.1 framework guidelines.
 

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
index aac4777ef4fc2b154d1d95b27edd677fa992f0cd..fe0debb26a0e58c8151253cefaddb9b7657c5ab8 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
@@ -120,7 +120,7 @@ namespace Cairo
                internal static extern void cairo_fill_preserve (IntPtr cr);
                
                [DllImport (cairo)]
-               internal static extern void cairo_font_extents (IntPtr cr, ref FontExtents extents);
+               internal static extern void cairo_font_extents (IntPtr cr, out FontExtents extents);
                
                // FontFace
                [DllImport (cairo)]

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
index 4cf460c48ce62d1221a2a37ae3eb3e5fff87dbbd..aabd594cf2f51bdf4a2b81f8d193fea2666e1601 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
@@ -778,9 +778,8 @@ namespace Cairo {
 
                 public FontExtents FontExtents {
                         get {
-                               
-                                FontExtents f_extents = new FontExtents();
-                                NativeMethods.cairo_font_extents (state, ref f_extents);
+                                FontExtents f_extents;
+                                NativeMethods.cairo_font_extents (state, out f_extents);
                                 return f_extents;
                         }
                 }