From d8a50fd73e35a6af6178373a04d3cbc7752cd4c3 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Sat, 21 Jan 2012 23:58:51 -0800 Subject: [PATCH] gdk-2.0: use uint8[] for Bitmap and Pixmap.create_from_data data Fixes bug 646339. --- vapi/gdk-2.0.vapi | 4 ++-- vapi/packages/gdk-2.0/gdk-2.0.metadata | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index 4419fc12f..d93accfd3 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -35,7 +35,7 @@ namespace Gdk { public class Bitmap { public weak GLib.Object parent_instance; [Deprecated (since = "2.22")] - public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height); + public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, [CCode (array_length = false)] uint8[] data, int width, int height); } [CCode (cheader_filename = "gdk/gdk.h")] public class Colormap : GLib.Object { @@ -440,7 +440,7 @@ namespace Gdk { [Deprecated (since = "2.22")] public static unowned Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data); [Deprecated (since = "2.22")] - public static unowned Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg); + public static unowned Gdk.Pixmap create_from_data (Gdk.Drawable drawable, [CCode (array_length = false)] uint8[] data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg); [Deprecated (since = "2.22")] public static unowned Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename); [Deprecated (since = "2.22")] diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata index a3b07cb4d..413bc4f1b 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0.metadata +++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata @@ -3,6 +3,7 @@ gdk_add_client_message_filter.data hidden="1" GdkAppLaunchContextClass hidden="1" GdkAtom is_value_type="1" simple_type="1" gdk_atom_name transfer_ownership="1" +gdk_bitmap_create_from_data.data type_name="uint8[]" no_array_length="1" gdk_cairo_create transfer_ownership="1" GdkColor is_value_type="1" gdk_color_parse.color is_out="1" @@ -85,6 +86,7 @@ gdk_pixbuf_get_from_image.dest nullable="1" gdk_pixbuf_get_from_image.cmap nullable="1" GdkPixmapObject hidden="1" GdkPixmapObjectClass hidden="1" +gdk_pixmap_create_from_data.data type_name="uint8[]" no_array_length="1" gdk_pixmap_create_from_xpm.mask is_out="1" gdk_pixmap_create_from_xpm_d.mask is_out="1" gdk_pixmap_new.drawable nullable="1" -- 2.47.2