diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-02 13:32:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-02 13:32:03 +0300 |
| commit | d06189201b05e034f4f99384557dbe50e9d09312 (patch) | |
| tree | aacfcab5cc8a5e3d7c1aa11553ce1925b513aad2 /gdk-pixbuf | |
| parent | 0af50489ac15a6608a86424e8d03d642d8621f75 (diff) | |
Make io-png.c actually compile with the libpng 1.5 we include
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index e86a70d662d0..726ca895643f 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -54,3 +54,67 @@ + return msgid; +#endif } +From: Maarten Bosmans <mkbosmans@gmail.com> +Date: Mon, 24 Jan 2011 10:39:22 +0000 +Subject: Use png_jmpbuf macro + +This makes the png loader compatible with libpng 1.5 + +diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c +index 79c81fd..76f3304 100644 +--- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_save_ptr), 1); + } + + static void +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_read_ptr), 1); + } + + static void +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + success = FALSE; + goto cleanup; + } |