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

Merge branch '8.7'

This commit is contained in:
John Cupitt 2019-01-04 10:36:59 +00:00
parent 87062c4a4f 63c6c7ae30
commit a293da4b5a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15,6 +15,9 @@
- dzsave has a new skip_blanks option
- add CMYK as a supported colourspace
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]

4
libvips/foreign/magick.c
View File

@ -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