2007-05-26 John Luke <john.luke@gmail.com>

	* Mono.Cairo/Cairo.cs:
	* Mono.Cairo/Context.cs: fix call to cairo_get_font_matrix,
	reported by patperry@stanford.edu (Patrick Perry) in bug#81626

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

diff --git a/mcs/class/Mono.Cairo/ChangeLog b/mcs/class/Mono.Cairo/ChangeLog
index 284ef9d328bf06e3a36e7d59ca730094de62597d..e69676d7fad32d634ff81efafdfdee1cdec050aa 100644 (file)
--- a/mcs/class/Mono.Cairo/ChangeLog
+++ b/mcs/class/Mono.Cairo/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-26  John Luke  <john.luke@gmail.com>
+
+       * Mono.Cairo/Cairo.cs:
+       * Mono.Cairo/Context.cs: fix call to cairo_get_font_matrix,
+       reported by patperry@stanford.edu (Patrick Perry) in bug#81626
+
 2007-01-15  Alp Toker  <alp@atoker.com>
 
        * Mono.Cairo/Surface.cs:

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
index d654e6ced78d95fd749f13a3bfeb18f9fb358b50..27590ce2bfbab7153beff43f076377759912f135 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Cairo.cs
@@ -209,7 +209,7 @@ namespace Cairo
                internal static extern IntPtr cairo_get_font_face (IntPtr cr);
                
                [DllImport (cairo)]
-               internal static extern Matrix cairo_get_font_matrix (IntPtr cr);
+               internal static extern void cairo_get_font_matrix (IntPtr cr, out Matrix matrix);
                
                [DllImport (cairo)]
                internal static extern void cairo_get_font_options (IntPtr cr, IntPtr options);

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
index 2c27c4aa4a8ba684e5a648f66acb380ce7ac411c..05441abfc6cc04936a8ea912143898c230c74b3d 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
@@ -692,7 +692,11 @@ namespace Cairo {
                }
                
                public Matrix FontMatrix {
-                       get { return CairoAPI.cairo_get_font_matrix (state); }
+                       get {
+                               Matrix m;
+                               CairoAPI.cairo_get_font_matrix (state, out m);
+                               return m;
+                       }
                        set { CairoAPI.cairo_set_font_matrix (state, value); }
                }