aboutsummaryrefslogtreecommitdiff
path: root/games/adgali/files/patch-src-input-imageio-agl_pngio.c
diff options
context:
space:
mode:
Diffstat (limited to 'games/adgali/files/patch-src-input-imageio-agl_pngio.c')
-rw-r--r--games/adgali/files/patch-src-input-imageio-agl_pngio.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/games/adgali/files/patch-src-input-imageio-agl_pngio.c b/games/adgali/files/patch-src-input-imageio-agl_pngio.c
index 9a7155464ad0..53ad107e4dee 100644
--- a/games/adgali/files/patch-src-input-imageio-agl_pngio.c
+++ b/games/adgali/files/patch-src-input-imageio-agl_pngio.c
@@ -1,5 +1,5 @@
--- src/input/imageio/agl_pngio.c.orig 2003-06-24 01:58:47.000000000 +0200
-+++ src/input/imageio/agl_pngio.c 2010-03-30 11:23:50.000000000 +0200
++++ src/input/imageio/agl_pngio.c 2012-05-01 09:02:25.000000000 +0200
@@ -65,7 +65,7 @@
unsigned char buf[8];
@@ -9,6 +9,15 @@
return 0;
}
+@@ -106,7 +106,7 @@
+ }
+
+ /* standard png error handler */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ agl_error("Error reading the PNG file");
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -131,7 +131,7 @@
/* see pnglib for these calls */
@@ -18,3 +27,12 @@
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png_ptr);
+@@ -171,7 +171,7 @@
+ *rowp = (png_bytep) pixelp;
+ /* standard png error handler redeclared to free the agl image if an
+ * error occurs */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ agl_error("Error reading the PNG file");
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);