added "#define PNG_PTR_NORETURN" to png.c to prevent png_longjmp() failure.

diff --git a/ChangeLog b/ChangeLog
index 07ebf2f4f9dfb667da5ec27a1f98f17cd933b2e5..2df49c4149f47cfdbdcd35dbe11aaa8bb8ffe4bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15  6.6.9-6 Glenn Randers-Pehrson <glennrp@image...>
+  * Added "#define PNG_PTR_NORETURN" because this macro does not work
+    on all platforms with libpng15, with failure to load png_longjmp() (ref
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18518).
+
 2011-04-15  6.6.9-5 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.9-5.
 

diff --git a/coders/png.c b/coders/png.c
index 200b2e114c3142f65cd68e382d8ef1cebe31caf9..7c6874587bdd5cb37a70916d38776b82732be0da 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -92,6 +92,8 @@
 /* #define PNG_NORETURN     This function does not return */
 /* #define PNG_ALLOCATED    The result of the function is new memory */
 /* #define PNG_DEPSTRUCT    Access to this struct member is deprecated */
+
+/* PNG_PTR_NORETURN does not work on some platforms, in libpng-1.5.x */
 #define PNG_PTR_NORETURN
 
 #include "png.h"