diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-08-25 12:09:18 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-08-25 12:40:21 -0400 |
| commit | 25327083200f692c14addfebe1b4ed5030a5a7d2 (patch) | |
| tree | 380b584903bf613f558223e6a9f93ae9f6d619ea | |
| parent | 58a094163919dacd4c3853dfe0c6020538c2bb99 (diff) | |
| download | gdk-pixbuf-25327083200f692c14addfebe1b4ed5030a5a7d2.tar.gz | |
Ignore internal deprecations in more places
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-csource.c | 2 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-pixdata.c | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/io-pixdata.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c index 25804c30b..3f949ba1a 100644 --- a/gdk-pixbuf/gdk-pixbuf-csource.c +++ b/gdk-pixbuf/gdk-pixbuf-csource.c @@ -52,6 +52,7 @@ static void print_csource (FILE *f_out, GdkPixbuf *pixbuf) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS GdkPixdata pixdata; gpointer free_me; GString *gstring; @@ -64,6 +65,7 @@ print_csource (FILE *f_out, g_fprintf (f_out, "%s\n", gstring->str); g_free (free_me); +G_GNUC_END_IGNORE_DEPRECATIONS } int diff --git a/gdk-pixbuf/gdk-pixbuf-pixdata.c b/gdk-pixbuf/gdk-pixbuf-pixdata.c index 970e8d391..f753e99c8 100644 --- a/gdk-pixbuf/gdk-pixbuf-pixdata.c +++ b/gdk-pixbuf/gdk-pixbuf-pixdata.c @@ -84,8 +84,10 @@ main (int argc, return 1; } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS free_me = gdk_pixdata_from_pixbuf (&pixdata, pixbuf, use_rle); - data = gdk_pixdata_serialize (&pixdata, &data_len); + data = gdk_pixdata_serialize (&pixdata, &data_len); +G_GNUC_END_IGNORE_DEPRECATIONS if (!g_file_set_contents (outfilename, (char *)data, data_len, &error)) { diff --git a/gdk-pixbuf/io-pixdata.c b/gdk-pixbuf/io-pixdata.c index 6a68565cc..fe665ecbf 100644 --- a/gdk-pixbuf/io-pixdata.c +++ b/gdk-pixbuf/io-pixdata.c @@ -71,6 +71,8 @@ static gboolean try_load (struct pixdata_context *context, GError **error) { GdkPixbuf *pixbuf; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + if (context->got_pixbuf) return TRUE; @@ -95,6 +97,7 @@ static gboolean try_load (struct pixdata_context *context, GError **error) (* context->updated_func) (pixbuf, 0, 0, pixbuf->width, pixbuf->height, context->user_data); return TRUE; +G_GNUC_END_IGNORE_DEPRECATIONS } static gboolean @@ -117,6 +120,7 @@ pixdata_image_load_increment (gpointer data, const guchar *buf, guint size, GErr { struct pixdata_context *context = (struct pixdata_context *) data; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_string_append_len (context->data, (char *)buf, size); if (!context->got_header && context->data->len >= GDK_PIXDATA_HEADER_LENGTH) @@ -152,6 +156,7 @@ pixdata_image_load_increment (gpointer data, const guchar *buf, guint size, GErr try_load (context, NULL); return TRUE; +G_GNUC_END_IGNORE_DEPRECATIONS } /* Always included */ |