png-1.5 hides structure members from public view. For this reason,
some code doesn't compile any more.
The attached patch against plotutils-2.6 fixes the problem.
I didn't find SVN or similar to check if the problem is still there.
Also, the home page at http://www.gnu.org/software/plotutils/ mentions
that 2.4.1 is the newest version and the linked manual is for 2.2.
Cheers,
Thomas
$NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $
Fix build with png-1.5.
--- libplot/z_write.c.orig 2008-07-16 00:54:10.000000000 +0000
+++ libplot/z_write.c
@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
}
/* cleanup after libpng errors (error handler does a longjmp) */
- if (setjmp (png_ptr->jmpbuf))
+ if (setjmp (png_jmpbuf (png_ptr)))
{
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
return -1;
@@ -444,7 +444,11 @@ _our_error_fn_stdio (png_struct *png_ptr
#endif
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_ptr, 1);
+#endif
}
static void
@@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
#endif
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_ptr, 1);
+#endif
}
static void
_______________________________________________
Bug-plotutils mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-plotutils
