Annotation of /trunk/gdk-pixbuf/patches/gdk-pixbuf-2.22.1-libpng15.patch
Parent Directory | Revision Log
Revision 1309 -
(hide annotations)
(download)
Fri Apr 8 10:13:54 2011 UTC (13 years, 5 months ago) by niro
File size: 2000 byte(s)
Fri Apr 8 10:13:54 2011 UTC (13 years, 5 months ago) by niro
File size: 2000 byte(s)
patches
1 | niro | 1309 | From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001 |
2 | From: Maarten Bosmans <mkbosmans@gmail.com> | ||
3 | Date: Mon, 24 Jan 2011 10:39:22 +0000 | ||
4 | Subject: Use png_jmpbuf macro | ||
5 | |||
6 | This makes the png loader compatible with libpng 1.5 | ||
7 | --- | ||
8 | diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c | ||
9 | index 79c81fd..76f3304 100644 | ||
10 | --- a/gdk-pixbuf/io-png.c | ||
11 | +++ b/gdk-pixbuf/io-png.c | ||
12 | @@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, | ||
13 | error_msg); | ||
14 | } | ||
15 | |||
16 | - longjmp (png_save_ptr->jmpbuf, 1); | ||
17 | + longjmp (png_jmpbuf(png_save_ptr), 1); | ||
18 | } | ||
19 | |||
20 | static void | ||
21 | @@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) | ||
22 | return NULL; | ||
23 | } | ||
24 | |||
25 | - if (setjmp (png_ptr->jmpbuf)) { | ||
26 | + if (setjmp (png_jmpbuf(png_ptr))) { | ||
27 | g_free (rows); | ||
28 | |||
29 | if (pixbuf) | ||
30 | @@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, | ||
31 | return NULL; | ||
32 | } | ||
33 | |||
34 | - if (setjmp (lc->png_read_ptr->jmpbuf)) { | ||
35 | + if (setjmp (png_jmpbuf(lc->png_read_ptr))) { | ||
36 | if (lc->png_info_ptr) | ||
37 | png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); | ||
38 | g_free(lc); | ||
39 | @@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, | ||
40 | lc->error = error; | ||
41 | |||
42 | /* Invokes our callbacks as needed */ | ||
43 | - if (setjmp (lc->png_read_ptr->jmpbuf)) { | ||
44 | + if (setjmp (png_jmpbuf(lc->png_read_ptr))) { | ||
45 | lc->error = NULL; | ||
46 | return FALSE; | ||
47 | } else { | ||
48 | @@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, | ||
49 | error_msg); | ||
50 | } | ||
51 | |||
52 | - longjmp (png_read_ptr->jmpbuf, 1); | ||
53 | + longjmp (png_jmpbuf(png_read_ptr), 1); | ||
54 | } | ||
55 | |||
56 | static void | ||
57 | @@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, | ||
58 | success = FALSE; | ||
59 | goto cleanup; | ||
60 | } | ||
61 | - if (setjmp (png_ptr->jmpbuf)) { | ||
62 | + if (setjmp (png_jmpbuf(png_ptr))) { | ||
63 | success = FALSE; | ||
64 | goto cleanup; | ||
65 | } | ||
66 | -- | ||
67 | cgit v0.9 |