diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-27 17:59:02 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-27 17:59:02 +0200 |
| commit | 2d9b6917808b76af76a85755b9f24ff4b49ee38b (patch) | |
| tree | e4d40663bc851c0de5ca0ef64e3bbea0079eee81 /gdk-pixbuf | |
| parent | 08ea0e636de1c1db7fd4f2063ff8980301bc0992 (diff) | |
Fix gdk-pixbuf on windows
Change-Id: I24cfe6dee408d0a6108da31eddc3abcfd2256671
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch index 142ea346f2d0..a6f6a84d95ae 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch @@ -128,70 +128,74 @@ + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const ---- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c 2010-07-10 02:54:35.000000000 +0200 -+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c 2011-03-22 02:18:55.515625000 +0100 -@@ -27,6 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <png.h> -+#include <pngstruct.h> +--- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c +@@ -30,6 +30,10 @@ + #include <pngstruct.h> #include "gdk-pixbuf-private.h" ++#ifndef png_jmpbuf ++# define png_jmpbuf(png_ptr) ((png_ptr)->png_jmpbuf) ++#endif ++ -@@ -183,7 +184,7 @@ + + static gboolean +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, error_msg); } - longjmp (png_save_ptr->jmpbuf, 1); -+ longjmp (png_save_ptr->png_jmpbuf, 1); ++ longjmp (png_jmpbuf (png_save_ptr), 1); } static void -@@ -287,7 +288,7 @@ +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) return NULL; } - if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_ptr->png_jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { g_free (rows); if (pixbuf) -@@ -459,7 +460,7 @@ +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, return NULL; } - if (setjmp (lc->png_read_ptr->jmpbuf)) { -+ if (setjmp (lc->png_read_ptr->png_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 +532,7 @@ +@@ -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 (lc->png_read_ptr->png_jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { lc->error = NULL; return FALSE; } else { -@@ -769,7 +770,7 @@ +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, error_msg); } - longjmp (png_read_ptr->jmpbuf, 1); -+ longjmp (png_read_ptr->png_jmpbuf, 1); ++ longjmp (png_jmpbuf (png_read_ptr), 1); } static void -@@ -978,7 +979,7 @@ +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, success = FALSE; goto cleanup; } - if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_ptr->png_jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { success = FALSE; goto cleanup; } + --- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc 2010-06-25 23:40:10.000000000 +0200 +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc 2011-03-24 06:13:30.515625000 +0100 @@ -1,9 +1,19 @@ |