diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-08-25 10:35:17 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-08-25 10:35:17 -0400 |
| commit | ad8b36493b297dff81cce8f538e007f43a2c3b51 (patch) | |
| tree | b211a333980f879560ae7cde9315d2d29d5e4493 /gdk-pixbuf/gdk-pixbuf-io.c | |
| parent | 73d07f72371086e191eaa258fe3a1c41bc9b48b5 (diff) | |
| download | gdk-pixbuf-ad8b36493b297dff81cce8f538e007f43a2c3b51.tar.gz | |
Ignore our own deprecations
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf-io.c')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 7f086db3f..8f9940237 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -1690,8 +1690,10 @@ _gdk_pixbuf_new_from_resource_try_mmap (const char *resource_path) gsize data_size; GBytes *bytes; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* We specialize uncompressed GdkPixdata files, making these a reference to the - compiled-in resource data */ + * compiled-in resource data + */ if (g_resources_get_info (resource_path, 0, &data_size, &flags, NULL) && (flags & G_RESOURCE_FLAGS_COMPRESSED) == 0 && data_size >= GDK_PIXDATA_HEADER_LENGTH && @@ -1715,6 +1717,7 @@ _gdk_pixbuf_new_from_resource_try_mmap (const char *resource_path) g_bytes_unref (bytes); } } +G_GNUC_END_IGNORE_DEPRECATIONS return NULL; } @@ -1737,8 +1740,8 @@ _gdk_pixbuf_new_from_resource_try_mmap (const char *resource_path) * Since: 2.26 **/ GdkPixbuf * -gdk_pixbuf_new_from_resource (const char *resource_path, - GError **error) +gdk_pixbuf_new_from_resource (const gchar *resource_path, + GError **error) { GInputStream *stream; GdkPixbuf *pixbuf; |