From: Evan Nemerson <evan@coeus-group.com>
Date: Sun, 20 Dec 2009 00:51:44 +0000 (-0800)
Subject: cogl-1.0: Cogl.Texture.from_data data does not provide array length.
X-Git-Tag: 0.7.10~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b8c3737f92748d65aa3ed84cd395fc761403594;p=thirdparty%2Fvala.git

cogl-1.0: Cogl.Texture.from_data data does not provide array length.

Fixes bug 604108.
---

diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi
index 7a143d95b..3f84f9b3a 100644
--- a/vapi/cogl-1.0.vapi
+++ b/vapi/cogl-1.0.vapi
@@ -125,7 +125,7 @@ namespace Cogl {
 	[CCode (ref_function = "cogl_texture_ref", unref_function = "cogl_texture_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Texture : Cogl.Handle {
 		public Texture.from_bitmap (Cogl.Bitmap bmp_handle, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-		public Texture.from_data (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, uint rowstride, uchar[] data);
+		public Texture.from_data (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, uint rowstride, [CCode (array_length = false)] uchar[] data);
 		public Texture.from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
 		public int get_data (Cogl.PixelFormat format, uint rowstride, uchar[] data);
 		public Cogl.PixelFormat get_format ();
diff --git a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
index ba7653cb1..e2d05a3b0 100644
--- a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
+++ b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
@@ -120,7 +120,7 @@ namespace Cogl {
 		public uint get_width ();
 		public bool is_sliced ();
 		public Texture.from_bitmap (Cogl.Bitmap bmp_handle, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-		public Texture.from_data (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, uint rowstride, uchar[] data);
+		public Texture.from_data (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, uint rowstride, [CCode (array_length = false)] uchar[] data);
 		public Texture.from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
 		public Texture.with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
 		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, uchar[] data);