Changeset 3629 for ImageMagick/trunk/coders/png.c

Timestamp:

02/19/11 14:15:38 (2 years ago)

Author:

glennrp

Message:

Reverted latest change to coders/png.c

File:

• ImageMagick/trunk/coders/png.c (modified) (6 diffs)

ImageMagick/trunk/coders/png.c

@@ -92 +92 @@
 /* #define PNG_NORETURN     This function does not return */
 /* #define PNG_ALLOCATED    The result of the function is new memory */
-#if (PNG_LIBPNG_VER >= 10400 && PNG_LIBPNG_VER < 10500)
-   #define PNG_DEPSTRUCT  /* Access to this struct member is deprecated */
-#endif
+/* #define PNG_DEPSTRUCT    Access to this struct member is deprecated */
 
 #include "png.h"
@@ -1348 +1346 @@
 
 #if (PNG_LIBPNG_VER < 10500)
+  /* A warning about deprecated use of jmpbuf here is unavoidable if you
+   * are building with libpng-1.4.x and can be ignored.
+   */
   longjmp(ping->jmpbuf,1);
 #else
@@ -1734 +1735 @@
   ping_pixels=(unsigned char *) NULL;
 
-#if (PNG_LIBPNG_VER < 10400 || PNG_LIBPNG_VER >= 10500)
   if (setjmp(png_jmpbuf(ping)))
-#else
-  /* Warning is unavoidable if #define PNG_DEPSTRUCT is not defined */
-  if (setjmp(ping->jmpbuf))
-#endif
     {
       /*
@@ -2400 +2396 @@
     Convert PNG pixels to pixel packets.
   */
-#if (PNG_LIBPNG_VER < 10400 || PNG_LIBPNG_VER >= 10500)
   if (setjmp(png_jmpbuf(ping)))
-#else
-  /* Warning is unavoidable if #define PNG_DEPSTRUCT is not defined */
-  if (setjmp(ping->jmpbuf))
-#endif
     {
       /*
@@ -7452 +7443 @@
   ping_pixels=(unsigned char *) NULL;
 
-#if (PNG_LIBPNG_VER < 10400 || PNG_LIBPNG_VER >= 10500)
   if (setjmp(png_jmpbuf(ping)))
-#else
-  /* Warning is unavoidable if #define PNG_DEPSTRUCT is not defined */
-  if (setjmp(ping->jmpbuf))
-#endif
     {
       /*
@@ -8750 +8736 @@
     Initialize image scanlines.
   */
-#if (PNG_LIBPNG_VER < 10400 || PNG_LIBPNG_VER >= 10500)
   if (setjmp(png_jmpbuf(ping)))
-#else
-  /* Warning is unavoidable if #define PNG_DEPSTRUCT is not defined */
-  if (setjmp(ping->jmpbuf))
-#endif
     {
       /*