bug-plotutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bug-plotutils] [PATCH] Allow compilation with newer libpng


From: Ludovic Courtès
Subject: [Bug-plotutils] [PATCH] Allow compilation with newer libpng
Date: Fri, 12 Jul 2013 18:05:26 +0200
User-agent: Gnus/5.130007 (Ma Gnus v0.7) Emacs/24.3 (gnu/linux)

Hello,

An upgrade from libpng 1.5.14 to 1.5.17 in Guix broke Plotutils.
This is fixed by the attached patch.

Thanks,
Ludo’.

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 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]