mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
8e5e7299d1
* gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/patches/plotutils-libpng-jmpbuf.patch: New file. * gnu/packages/plotutils.scm (plotutils): Add `plotutils-libpng-jmpbuf.patch' as an input, and apply it.
23 lines
746 B
Diff
23 lines
746 B
Diff
Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0:
|
|
http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt .
|
|
|
|
--- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200
|
|
+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200
|
|
@@ -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,7 @@ _our_error_fn_stdio (png_struct *png_ptr
|
|
#endif
|
|
}
|
|
|
|
- longjmp (png_ptr->jmpbuf, 1);
|
|
+ longjmp (png_jmpbuf (png_ptr), 1);
|
|
}
|
|
|
|
static void
|