Mercurial > mxe-octave

view src/plotutils-2.6-libpng-1.5.patch @ 4590:5b5c47cd2111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add file with hg id of MXE-Octave to dist package (bug #52794). * tools/mk-hg-id.sh: New file copied (mostly) from Octave sources. * Makefile.in: Call shell script, copy HG-ID in make dist * binary-dist-rules.mk: Copy HG-ID to dist directory. * dist-files.mk: add mk-hg-id.sh to dist files
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 03 Jan 2018 14:18:12 +0100
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
fix building with libpng-1.5

--- a/libplot/z_write.c
+++ b/libplot/z_write.c
@@ -164,7 +164,7 @@
     }
 
   /* cleanup after libpng errors (error handler does a longjmp) */
-  if (setjmp (png_ptr->jmpbuf))
+  if (png_jmpbuf (png_ptr))
     {
       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
       return -1;
@@ -444,7 +444,7 @@
 #endif
     }
 
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 static void 
@@ -515,7 +515,7 @@
 #endif
     }
 
-  longjmp (png_ptr->jmpbuf, 1);
+  longjmp (png_jmpbuf (png_ptr), 1);
 }
 
 static void