fix GdkPixdata binding

2008-01-23  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gdk-pixbuf-2.0/: fix GdkPixdata binding

	* vapi/gdk-pixbuf-2.0.vapi: regenerated

svn path=/trunk/; revision=900

diff --git a/ChangeLog b/ChangeLog
index e03b2be..0bf3746 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-23  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/gdk-pixbuf-2.0/: fix GdkPixdata binding
+
+       * vapi/gdk-pixbuf-2.0.vapi: regenerated
+
+2008-01-23  Jürg Billeter  <j@bitron.ch>
+
        * vala/valaintegertype.vala: override copy method
 
 2008-01-23  Jürg Billeter  <j@bitron.ch>

diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index e19863c..0d1efc6 100644 (file)
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -72,20 +72,6 @@ namespace Gdk {
        public class PixbufSimpleAnimClass {
        }
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
-       public class Pixdata {
-               public uint magic;
-               public int length;
-               public uint pixdata_type;
-               public uint rowstride;
-               public uint width;
-               public uint height;
-               public uchar pixel_data;
-               public bool deserialize (uint stream_length, uchar stream) throws GLib.Error;
-               public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
-               public uchar serialize (uint stream_length_p);
-               public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type);
-       }
-       [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
        public class Pixbuf : GLib.Object {
                public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
                public weak Gdk.Pixbuf apply_embedded_orientation ();
@@ -190,6 +176,22 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
        public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
        }
+       [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+       public struct Pixdata {
+               public uint magic;
+               public int length;
+               public uint pixdata_type;
+               public uint rowstride;
+               public uint width;
+               public uint height;
+               [NoArrayLength]
+               public weak uchar[] pixel_data;
+               [NoArrayLength]
+               public bool deserialize (uint stream_length, uchar[] stream) throws GLib.Error;
+               public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
+               public uchar serialize (uint stream_length_p);
+               public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type);
+       }
        public static delegate void PixbufDestroyNotify (uchar[] pixels, pointer data);
        public static delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data);
        public const int PIXBUF_FEATURES_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 cd1f99e..becdd0b 100644 (file)
--- a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
@@ -4,4 +4,6 @@ gdk_pixbuf_save_to_bufferv.option_keys is_array="1"
 gdk_pixbuf_save_to_bufferv.option_values is_array="1"
 gdk_pixbuf_save_to_callbackv.option_keys is_array="1"
 gdk_pixbuf_save_to_callbackv.option_values is_array="1"
-
+GdkPixdata is_value_type="1"
+GdkPixdata.pixel_data is_array="1"
+gdk_pixdata_deserialize.stream is_array="1"