sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix small magicksave error

Browse Source 
copy-paste fail meant that IM exceptions were not inherited correctly

see 1619c8b1a1 (commitcomment-31838043)
This commit is contained in:
John Cupitt 2019-01-04 10:34:30 +00:00
parent 1619c8b1a1
commit 63c6c7ae30
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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 21/11/18 started 8.7.3
- fix infinite loop for autofit with non-scaleable font - fix infinite loop for autofit with non-scaleable font
- mapim was not offsetting by window offset [erdmann] - mapim was not offsetting by window offset [erdmann]

6
configure.ac
View File

@ -2,7 +2,7 @@
# also update the version number in the m4 macros below # 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 # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)
@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [8]) m4_define([vips_major_version], [8])
m4_define([vips_minor_version], [7]) m4_define([vips_minor_version], [7])
m4_define([vips_micro_version], [3]) m4_define([vips_micro_version], [4])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_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 # binary interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=51 LIBRARY_CURRENT=51
LIBRARY_REVISION=4 LIBRARY_REVISION=5
LIBRARY_AGE=9 LIBRARY_AGE=9
# patched into include/vips/version.h # patched into include/vips/version.h

4
libvips/foreign/magick.c
View File

@ -248,9 +248,9 @@ magick_destroy_exception( ExceptionInfo *exception )
void void
magick_inherit_exception( ExceptionInfo *exception, Image *image ) magick_inherit_exception( ExceptionInfo *exception, Image *image )
{ {
#ifdef HAVE_INHERITEXCEPTIONINFO #ifdef HAVE_INHERITEXCEPTION
InheritException( exception, &image->exception ); InheritException( exception, &image->exception );
#endif /*HAVE_INHERITEXCEPTIONINFO*/ #endif /*HAVE_INHERITEXCEPTION*/
} }
void void