| 1 |
nirbheek 11/04/04 17:42:49 |
| 2 |
|
| 3 |
Added: gdk-pixbuf-2.22.1-fix-libpng15.patch |
| 4 |
Log: |
| 5 |
Fix building with libpng-1.5, bug 354557 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.45/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gdk-pixbuf-2.22.1-fix-libpng15.patch |
| 16 |
=================================================================== |
| 17 |
From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001 |
| 18 |
From: Maarten Bosmans <mkbosmans@×××××.com> |
| 19 |
Date: Mon, 24 Jan 2011 10:39:22 +0000 |
| 20 |
Subject: Use png_jmpbuf macro |
| 21 |
|
| 22 |
This makes the png loader compatible with libpng 1.5 |
| 23 |
--- |
| 24 |
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c |
| 25 |
index 79c81fd..76f3304 100644 |
| 26 |
--- a/gdk-pixbuf/io-png.c |
| 27 |
+++ b/gdk-pixbuf/io-png.c |
| 28 |
@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, |
| 29 |
error_msg); |
| 30 |
} |
| 31 |
|
| 32 |
- longjmp (png_save_ptr->jmpbuf, 1); |
| 33 |
+ longjmp (png_jmpbuf(png_save_ptr), 1); |
| 34 |
} |
| 35 |
|
| 36 |
static void |
| 37 |
@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) |
| 38 |
return NULL; |
| 39 |
} |
| 40 |
|
| 41 |
- if (setjmp (png_ptr->jmpbuf)) { |
| 42 |
+ if (setjmp (png_jmpbuf(png_ptr))) { |
| 43 |
g_free (rows); |
| 44 |
|
| 45 |
if (pixbuf) |
| 46 |
@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, |
| 47 |
return NULL; |
| 48 |
} |
| 49 |
|
| 50 |
- if (setjmp (lc->png_read_ptr->jmpbuf)) { |
| 51 |
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { |
| 52 |
if (lc->png_info_ptr) |
| 53 |
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); |
| 54 |
g_free(lc); |
| 55 |
@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, |
| 56 |
lc->error = error; |
| 57 |
|
| 58 |
/* Invokes our callbacks as needed */ |
| 59 |
- if (setjmp (lc->png_read_ptr->jmpbuf)) { |
| 60 |
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { |
| 61 |
lc->error = NULL; |
| 62 |
return FALSE; |
| 63 |
} else { |
| 64 |
@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, |
| 65 |
error_msg); |
| 66 |
} |
| 67 |
|
| 68 |
- longjmp (png_read_ptr->jmpbuf, 1); |
| 69 |
+ longjmp (png_jmpbuf(png_read_ptr), 1); |
| 70 |
} |
| 71 |
|
| 72 |
static void |
| 73 |
@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, |
| 74 |
success = FALSE; |
| 75 |
goto cleanup; |
| 76 |
} |
| 77 |
- if (setjmp (png_ptr->jmpbuf)) { |
| 78 |
+ if (setjmp (png_jmpbuf(png_ptr))) { |
| 79 |
success = FALSE; |
| 80 |
goto cleanup; |
| 81 |
} |
| 82 |
-- |
| 83 |
cgit v0.9 |
Archives