Blame SOURCES/plotutils-2.6-png15.patch
|
 |
3c6e61 |
diff -up plotutils-2.6/libplot/z_write.c.png15 plotutils-2.6/libplot/z_write.c
|
|
|
3c6e61 |
--- plotutils-2.6/libplot/z_write.c.png15 2008-07-15 20:54:10.000000000 -0400
|
|
|
3c6e61 |
+++ plotutils-2.6/libplot/z_write.c 2012-03-22 13:26:48.251676137 -0400
|
|
|
3c6e61 |
@@ -164,7 +164,11 @@ _pl_z_maybe_output_image (S___(Plotter *
|
|
|
3c6e61 |
}
|
|
|
3c6e61 |
|
|
|
3c6e61 |
/* cleanup after libpng errors (error handler does a longjmp) */
|
|
|
3c6e61 |
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
|
3c6e61 |
+ if (setjmp (png_jmpbuf(png_ptr)))
|
|
|
3c6e61 |
+#else
|
|
|
3c6e61 |
if (setjmp (png_ptr->jmpbuf))
|
|
|
3c6e61 |
+#endif
|
|
|
3c6e61 |
{
|
|
|
3c6e61 |
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
|
|
|
3c6e61 |
return -1;
|
|
|
3c6e61 |
@@ -444,7 +448,11 @@ _our_error_fn_stdio (png_struct *png_ptr
|
|
|
3c6e61 |
#endif
|
|
|
3c6e61 |
}
|
|
|
3c6e61 |
|
|
|
3c6e61 |
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
|
3c6e61 |
+ longjmp (png_jmpbuf(png_ptr), 1);
|
|
|
3c6e61 |
+#else
|
|
|
3c6e61 |
longjmp (png_ptr->jmpbuf, 1);
|
|
|
3c6e61 |
+#endif
|
|
|
3c6e61 |
}
|
|
|
3c6e61 |
|
|
|
3c6e61 |
static void
|
|
|
3c6e61 |
@@ -515,7 +523,11 @@ _our_error_fn_stream (png_struct *png_pt
|
|
|
3c6e61 |
#endif
|
|
|
3c6e61 |
}
|
|
|
3c6e61 |
|
|
|
3c6e61 |
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
|
3c6e61 |
+ longjmp (png_jmpbuf(png_ptr), 1);
|
|
|
3c6e61 |
+#else
|
|
|
3c6e61 |
longjmp (png_ptr->jmpbuf, 1);
|
|
|
3c6e61 |
+#endif
|
|
|
3c6e61 |
}
|
|
|
3c6e61 |
|
|
|
3c6e61 |
static void
|