Changeset 29406

Timestamp:

Oct 14, 2010, 9:35:22 AM (16 years ago)

Author:

eugene

Message:

jmpbuf was deprecated: test for PNG_SETJMP_SUPPORTED and use the png_jmpbuf macro if needed

File:

• trunk/Ohana/src/kapa2/src/PNGit.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/PNGit.c

@@ -15 +15 @@
   png_structp png_ptr;
   png_infop info_ptr;
-  int Npalette;
+  int status, Npalette;
   char filename[1024];
   bDrawBuffer *buffer = NULL;
@@ -47 +47 @@
   }
 
-  if (setjmp (png_ptr[0].jmpbuf)) {
+#ifdef PNG_SETJMP_SUPPORTED
+  status = setjmp (png_ptr[0].jmpbuf);
+# else
+  status = setjmp(png_jmpbuf(png_ptr));
+# endif
+
+  if (status) {
     fprintf (stderr, "can't get png return\n");
     png_destroy_write_struct (&png_ptr, &info_ptr);