From: Simon McVittie <smcv@debian.org>
Date: Sat, 21 Jan 2012 22:19:29 +0000 (+0000)
Subject: If linking libpng conventionally, use the png_jmpbuf macro
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4644e6c812103cf2377ed5e639f221af31f17dd0;p=xonotic%2Fdarkplaces.git

If linking libpng conventionally, use the png_jmpbuf macro

This is necessary to compile against libpng 1.5.x.

Origin: vendor, Debian
---

diff --git a/image_png.c b/image_png.c
index a3afb3cc..5c9d0571 100644
--- a/image_png.c
+++ b/image_png.c
@@ -44,7 +44,7 @@ my_setjmp (jmp_buf env)
 
 #ifdef LINK_TO_PNG
 
-#define qpng_setjmp(png) my_setjmp (png->jmpbuf)
+#define qpng_setjmp(png) my_setjmp (png_jmpbuf (png))
 
 #define qpng_set_sig_bytes png_set_sig_bytes
 #define qpng_sig_cmp png_sig_cmp