X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Fpngsize.c;h=023c829f39b6e204b72387c888e78aaf9beb7d7c;hp=59e2003f00c404722a5e13b519c28be0a72c948f;hb=35354e059a77479a7a135c1e4fc71c76523fd7c4;hpb=61db3bacdfadeec7ed9b9160ff10316099668721

diff --git a/src/pngsize.c b/src/pngsize.c
index 59e2003..023c829 100644
--- a/src/pngsize.c
+++ b/src/pngsize.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.99907080300  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3.0  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * pngsize.c  determine the size of a PNG image
  *****************************************************************************/
@@ -27,18 +27,21 @@ int PngSize(
 /* this is to make compile on aix work since they seem to define jmpbuf
    to be _jmpbuf which breaks compilation */
 
+#ifndef png_jmpbuf
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr)   ((png_ptr)->PNG_jmpbuf)
+#else
 #ifdef jmpbuf
 #undef jmpbuf
 #endif
-
-#ifndef png_jmpbuf
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
 #endif
+#endif
 
-  if (setjmp(png_jmpbuf(png_read_ptr))){
-    png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp)NULL);
-    return 0;
-  }
+    if (setjmp(png_jmpbuf(png_read_ptr))) {
+        png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp) NULL);
+        return 0;
+    }
 
     png_init_io(png_read_ptr, fd);
     png_read_info(png_read_ptr, info_ptr);