Author: mkestner
Date: 2006-01-13 16:09:50 -0500 (Fri, 13 Jan 2006)
New Revision: 55550
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
Log:
2006-01-13 Mike Kestner <[EMAIL PROTECTED]>
* MimeIcon.cs: size_t on lp64 fix for gdk_pixbuf_save_to_file extern.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-01-13 20:55:56 UTC (rev 55549)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-01-13 21:09:50 UTC (rev 55550)
@@ -1,3 +1,7 @@
+2006-01-13 Mike Kestner <[EMAIL PROTECTED]>
+
+ * MimeIcon.cs: size_t on lp64 fix for gdk_pixbuf_save_to_file extern.
+
2006-01-13 Jackson Harper <[EMAIL PROTECTED]>
* TreeView.cs: On MS GetNodeAt never actually factors in the X
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
2006-01-13 20:55:56 UTC (rev 55549)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
2006-01-13 21:09:50 UTC (rev 55550)
@@ -960,7 +960,7 @@
static extern IntPtr rsvg_pixbuf_from_file_at_size (string
file_name, int width, int height, out IntPtr error);
[DllImport("libgdk-x11-2.0.so")]
- static extern bool gdk_pixbuf_save_to_buffer (IntPtr pixbuf,
out IntPtr buffer, out uint buffer_size, string type, out IntPtr error, IntPtr
option_dummy);
+ static extern bool gdk_pixbuf_save_to_buffer (IntPtr pixbuf,
out IntPtr buffer, out UIntPtr buffer_size, string type, out IntPtr error,
IntPtr option_dummy);
[DllImport("libglib-2.0.so")]
static extern void g_free (IntPtr mem);
@@ -996,14 +996,15 @@
error = IntPtr.Zero;
IntPtr buffer;
- uint buffer_size;
+ UIntPtr buffer_size_as_ptr;
string type = "png";
- bool saved = gdk_pixbuf_save_to_buffer (pixbuf, out
buffer, out buffer_size, type, out error, IntPtr.Zero);
+ bool saved = gdk_pixbuf_save_to_buffer (pixbuf, out
buffer, out buffer_size_as_ptr, type, out error, IntPtr.Zero);
if (!saved)
return null;
+ int buffer_size = (int) (uint) buffer_size_as_ptr;
byte[] result = new byte [buffer_size];
Marshal.Copy (buffer, result, 0, (int) buffer_size);
g_free (buffer);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
