From 63c6c7ae3075e6a1b810de4a649c730b62a55587 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 4 Jan 2019 10:34:30 +0000 Subject: [PATCH] fix small magicksave error copy-paste fail meant that IM exceptions were not inherited correctly see https://github.com/libvips/libvips/commit/1619c8b1a1c0a1e2c2d853e6d01671f712466dbb#commitcomment-31838043 --- ChangeLog | 3 +++ configure.ac | 6 +++--- libvips/foreign/magick.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 324a00e0..e80313a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +4/1/19 started 8.7.4 +- magicksave with magick6 API did not chain exceptions correctly [kleisauke] + 21/11/18 started 8.7.3 - fix infinite loop for autofit with non-scaleable font - mapim was not offsetting by window offset [erdmann] diff --git a/configure.ac b/configure.ac index f5e15cf2..f3c6abc6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT([vips], [8.7.3], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [8.7.4], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ(2.62) @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [8]) m4_define([vips_minor_version], [7]) -m4_define([vips_micro_version], [3]) +m4_define([vips_micro_version], [4]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog` # binary interface changes not backwards compatible?: reset age to 0 LIBRARY_CURRENT=51 -LIBRARY_REVISION=4 +LIBRARY_REVISION=5 LIBRARY_AGE=9 # patched into include/vips/version.h diff --git a/libvips/foreign/magick.c b/libvips/foreign/magick.c index 65bf9546..49a8aa7b 100644 --- a/libvips/foreign/magick.c +++ b/libvips/foreign/magick.c @@ -248,9 +248,9 @@ magick_destroy_exception( ExceptionInfo *exception ) void magick_inherit_exception( ExceptionInfo *exception, Image *image ) { -#ifdef HAVE_INHERITEXCEPTIONINFO +#ifdef HAVE_INHERITEXCEPTION InheritException( exception, &image->exception ); -#endif /*HAVE_INHERITEXCEPTIONINFO*/ +#endif /*HAVE_INHERITEXCEPTION*/ } void