From: Evan Nemerson Date: Fri, 20 Aug 2010 04:08:14 +0000 (-0700) Subject: gdk-pixbuf-2.0: Use uint8[] for binary data. X-Git-Tag: 0.11.0~161 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788edff0c6f5d8903d8a05b6a07d2fd59f944eca;p=thirdparty%2Fvala.git gdk-pixbuf-2.0: Use uint8[] for binary data. --- diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi index 068ba3e04..f56321fa6 100644 --- a/vapi/gdk-pixbuf-2.0.vapi +++ b/vapi/gdk-pixbuf-2.0.vapi @@ -17,7 +17,7 @@ namespace Gdk { public void fill (uint32 pixel); public Gdk.Pixbuf flip (bool horizontal); [CCode (has_construct_function = false)] - public Pixbuf.from_data ([CCode (array_length = false)] uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn); + public Pixbuf.from_data ([CCode (array_length = false)] uint8[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn); [CCode (has_construct_function = false)] public Pixbuf.from_file (string filename) throws GLib.Error; [CCode (has_construct_function = false)] @@ -25,7 +25,7 @@ namespace Gdk { [CCode (has_construct_function = false)] public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error; [CCode (has_construct_function = false)] - public Pixbuf.from_inline (int data_length, [CCode (array_length = false)] uchar[] data, bool copy_pixels) throws GLib.Error; + public Pixbuf.from_inline (int data_length, [CCode (array_length = false)] uint8[] data, bool copy_pixels = true) throws GLib.Error; public static unowned Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error; [CCode (has_construct_function = false)] public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable) throws GLib.Error; @@ -42,7 +42,7 @@ namespace Gdk { public int get_n_channels (); public unowned string get_option (string key); [CCode (array_length = false)] - public unowned uchar[] get_pixels (); + public unowned uint8[] get_pixels (); public int get_rowstride (); public int get_width (); public Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle); @@ -110,7 +110,7 @@ namespace Gdk { public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error; [CCode (has_construct_function = false)] public PixbufLoader.with_type (string image_type) throws GLib.Error; - public bool write ([CCode (array_length = false)] uchar[] buf, size_t count) throws GLib.Error; + public bool write ([CCode (array_length_type = "gsize")] uint8[] buf) throws GLib.Error; public virtual signal void area_prepared (); public virtual signal void area_updated (int x, int y, int width, int height); public virtual signal void closed (); @@ -141,10 +141,10 @@ namespace Gdk { public uint32 width; public uint32 height; [CCode (array_length = false)] - public weak uchar[] pixel_data; - public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error; + public weak uint8[] pixel_data; + public bool deserialize ([CCode (array_length_pos = 0.9)] uint8[] stream) throws GLib.Error; public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle); - public unowned uchar[] serialize (); + public unowned uint8[] serialize (); public unowned GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type); } [CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] @@ -202,7 +202,7 @@ namespace Gdk { FAILED, } [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] - public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uchar[] pixels); + public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uint8[] pixels); [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] public delegate bool PixbufSaveFunc (string buf, size_t count, GLib.Error error); [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata index 5984b7065..a0089befb 100644 --- a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata +++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata @@ -2,14 +2,15 @@ Gdk cheader_filename="gdk-pixbuf/gdk-pixdata.h" gir_namespace="GdkPixbuf" gir_ve gdk_pixbuf_copy transfer_ownership="1" gdk_pixbuf_get_file_info.width is_out="1" gdk_pixbuf_get_file_info.height is_out="1" -gdk_pixbuf_get_pixels no_array_length="1" +gdk_pixbuf_get_pixels type_name="uint8" is_array="1" no_array_length="1" gdk_pixbuf_new_from_data.destroy_fn nullable="1" gdk_pixbuf_new_from_data.destroy_fn_data hidden="1" -gdk_pixbuf_new_from_data.data no_array_length="1" +gdk_pixbuf_new_from_data.data type_name="uint8" is_array="1" no_array_length="1" gdk_pixbuf_new_from_stream.cancellable nullable="1" gdk_pixbuf_new_from_stream_at_scale.cancellable nullable="1" gdk_pixbuf_new_from_xpm_data.data is_array="1" no_array_length="1" -gdk_pixbuf_new_from_inline.data is_array="1" no_array_length="1" +gdk_pixbuf_new_from_inline.data type_name="uint8" is_array="1" no_array_length="1" +gdk_pixbuf_new_from_inline.copy_pixels default_value="true" gdk_pixbuf_save ellipsis="1" gdk_pixbuf_save_to_buffer*.buffer type_name="uint8" ctype="gchar**" is_array="1" array_length_type="gsize" is_out="1" transfer_ownership="1" gdk_pixbuf_save_to_buffer*.buffer_size hidden="1" @@ -22,12 +23,13 @@ gdk_pixbuf_save_to_callbackv.option_values is_array="1" gdk_pixbuf_scale_simple transfer_ownership="1" gdk_pixbuf_rotate_simple transfer_ownership="1" gdk_pixbuf_flip transfer_ownership="1" -gdk_pixbuf_loader_write.buf no_array_length="1" -GdkPixbufDestroyNotify.pixels no_array_length="1" +gdk_pixbuf_loader_write.buf type_name="uint8" is_array="1" array_length_type="gsize" +gdk_pixbuf_loader_write.count hidden="1" +GdkPixbufDestroyNotify.pixels type_name="uint8" is_array="1" no_array_length="1" GdkPixbufError errordomain="1" GdkPixdata is_value_type="1" -GdkPixdata.pixel_data is_array="1" -gdk_pixdata_deserialize.stream is_array="1" array_length_pos="0.9" +GdkPixdata.pixel_data type_name="uint8" is_array="1" +gdk_pixdata_deserialize.stream type_name="uint8" is_array="1" array_length_pos="0.9" gdk_pixdata_deserialize.stream_length hidden="1" -gdk_pixdata_serialize is_array="1" transfers_ownership="1" +gdk_pixdata_serialize type_name="uint8" is_array="1" transfers_ownership="1" gdk_pixdata_serialize.stream_length_p hidden="1"