[vala] gdk-pixbuf-2.0: remove some obsolete metadata
- From: Evan Nemerson <evann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gdk-pixbuf-2.0: remove some obsolete metadata
- Date: Mon, 25 Jun 2012 22:34:32 +0000 (UTC)
commit 935d54f4cd6fe446aec73ea0804316f2c01cd8ab
Author: Evan Nemerson <evan coeus-group com>
Date: Mon Jun 25 15:33:58 2012 -0700
gdk-pixbuf-2.0: remove some obsolete metadata
vapi/gdk-pixbuf-2.0.vapi | 10 ++++++-
vapi/metadata/GdkPixbuf-2.0-custom.vala | 9 +++--
vapi/metadata/GdkPixbuf-2.0.metadata | 49 ++++++++++++------------------
3 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 2954169..f11a034 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -33,8 +33,14 @@ namespace Gdk {
public Pixbuf.from_resource_at_scale (string resource_path, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
[CCode (has_construct_function = false)]
public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cname = "gdk_pixbuf_new_from_stream_async")]
+ public async Pixbuf.from_stream_async (GLib.InputStream stream, GLib.Cancellable? cancellable);
[CCode (has_construct_function = false)]
public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cname = "gdk_pixbuf_new_from_stream_at_scale_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
+ public async Pixbuf.from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (has_construct_function = false)]
+ public Pixbuf.from_stream_finish (GLib.AsyncResult async_result) throws GLib.Error;
[CCode (has_construct_function = false)]
public Pixbuf.from_xpm_data ([CCode (array_length = false, type = "char**")] string[] data);
public int get_bits_per_sample ();
@@ -53,8 +59,10 @@ namespace Gdk {
public int get_rowstride ();
public int get_width ();
[CCode (cname = "gdk_pixbuf_new_from_stream_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
+ [Deprecated (replacement = "Pixbuf.from_stream_async", since = "vala-0.18")]
public static async Gdk.Pixbuf new_from_stream_async (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
[CCode (cname = "gdk_pixbuf_new_from_stream_at_scale_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
+ [Deprecated (replacement = "Pixbuf.from_stream_at_scale_async", since = "vala-0.18")]
public static async Gdk.Pixbuf new_from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
public Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
@@ -225,7 +233,7 @@ namespace Gdk {
FAILED;
public static GLib.Quark quark ();
}
- [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+ [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", instance_pos = 1.9)]
public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uint8[] pixels);
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", instance_pos = -0.9)]
public delegate bool PixbufSaveFunc ([CCode (array_length_type = "gsize")] uint8[] buf) throws GLib.Error;
diff --git a/vapi/metadata/GdkPixbuf-2.0-custom.vala b/vapi/metadata/GdkPixbuf-2.0-custom.vala
index 061b70a..e771550 100644
--- a/vapi/metadata/GdkPixbuf-2.0-custom.vala
+++ b/vapi/metadata/GdkPixbuf-2.0-custom.vala
@@ -4,10 +4,14 @@ namespace Gdk {
public Pixbuf.from_data ([CCode (array_length = false)] owned uint8[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, [CCode (type = "GdkPixbufDestroyNotify")] Gdk.PixbufDestroyNotify? destroy_fn = GLib.free);
[CCode (has_construct_function = false, cname = "gdk_pixbuf_new_from_data")]
public Pixbuf.with_unowned_data ([CCode (array_length = false)] uint8[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, [CCode (type = "GdkPixbufDestroyNotify")] Gdk.PixbufDestroyNotify? destroy_fn = null);
+ [Deprecated (since = "vala-0.18", replacement = "Pixbuf.from_stream_async")]
[CCode (cname = "gdk_pixbuf_new_from_stream_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
public static async Gdk.Pixbuf new_from_stream_async (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [Deprecated (since = "vala-0.18", replacement = "Pixbuf.from_stream_at_scale_async")]
[CCode (cname = "gdk_pixbuf_new_from_stream_at_scale_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
- public static async Gdk.Pixbuf new_from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ public static async Gdk.Pixbuf new_from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cname = "gdk_pixbuf_new_from_stream_at_scale_async", finish_name = "gdk_pixbuf_new_from_stream_finish")]
+ public async Pixbuf.from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
[CCode (has_construct_function = false)]
public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
public bool save (string filename, string type, ...) throws GLib.Error;
@@ -16,11 +20,8 @@ namespace Gdk {
public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable? cancellable = null) throws GLib.Error;
[CCode (finish_name = "gdk_pixbuf_save_to_stream_finish")]
public async bool save_to_stream_async (GLib.OutputStream stream, string type, GLib.Cancellable? cancellable = null) throws GLib.Error;
- public bool save_to_callbackv ([CCode (delegate_target_pos = 1.5)] Gdk.PixbufSaveFunc save_func, string type, [CCode (array_length = false, array_null_terminated = true)] string[] option_keys, [CCode (array_length = false, array_null_terminated = true)] string[] option_values) throws GLib.Error;
}
- [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
- public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uint8[] pixels);
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", instance_pos = -0.9)]
public delegate bool PixbufSaveFunc ([CCode (array_length_type = "gsize")] uint8[] buf) throws GLib.Error;
}
diff --git a/vapi/metadata/GdkPixbuf-2.0.metadata b/vapi/metadata/GdkPixbuf-2.0.metadata
index 3d4e723..a81e591 100644
--- a/vapi/metadata/GdkPixbuf-2.0.metadata
+++ b/vapi/metadata/GdkPixbuf-2.0.metadata
@@ -1,37 +1,28 @@
-*.*.cancellable default=null
-
Pixbuf
- .composite_color_simple nullable
- .flip nullable
- .from_pixdata cheader_filename="gdk-pixbuf/gdk-pixdata.h"
- .from_pixdata.copy_pixels default=true
- .new_from_data skip
- .new_from_inline.copy_pixels default=true
- .new_from_stream_async skip
- .new_from_stream_finish skip
- .new_from_stream_at_scale_async skip
.new_from_xpm_data.data type="string[]"
+ .new_from_stream_at_scale_async skip
.new_subpixbuf skip
.save_to_stream_finish skip
.gettext skip
-Pixdata
- .to_csource skip=false
+
+// gdk-pixdata.h isn't included by gdk-pixbuf.h
Pixdata* cheader_filename="gdk-pixbuf/gdk-pixdata.h"
-PixbufSaveFunc skip
+Pixbuf
+ .from_pixdata cheader_filename="gdk-pixbuf/gdk-pixdata.h"
+
+// default values other than null
+Pixbuf
+ .new_from_data skip
+
+// Bug #558620: default values
+Pixbuf
+ .from_pixdata.copy_pixels default=true
+ .new_from_inline.copy_pixels default=true
-// Upstream
+// Bug #660879: nullability of return values
Pixbuf
- .new_from_inline.data type="uint8[]" array_length_idx=0
- .get_file_info unowned
- .get_file_info.width out
- .get_file_info.height out
- .get_pixels type="unowned uint8[]"
- .save_to_bufferv.buffer type="uint8[]" out array_length_idx=1
- .save_to_callbackv skip
- .from_pixdata skip=false unowned=false
-Pixdata
- .pixel_data type="unowned uint8[]"
- .serialize type="uint8[]" array_length_idx=0
-PixbufLoader
- .get_format unowned
-PixbufDestroyNotify skip
+ .composite_color_simple nullable
+ .flip nullable
+
+// Bug #666798: delegates which throw exceptions
+PixbufSaveFunc skip
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]