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

fix build with magick7

Browse Source
This commit is contained in:
John Cupitt 2018-06-10 12:15:02 +01:00
parent fb64d3607a
commit 0d8a440aff
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -682,8 +682,7 @@ if test x"$magick6" = x"yes"; then
fi fi
if test x"$magick6" = x"yes"; then if test x"$magick6" = x"yes"; then
# do we have number_scenes in image_info ... imagemagick uses this, gm # do we have number_scenes in image_info ... imagemagick uses this
# still uses subrange
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $MAGICK_CFLAGS" CFLAGS="$CFLAGS $MAGICK_CFLAGS"
AC_CHECK_MEMBER([struct _ImageInfo.number_scenes], AC_CHECK_MEMBER([struct _ImageInfo.number_scenes],

42
libvips/foreign/magick.c
View File

@ -89,6 +89,22 @@ magick_inherit_exception( ExceptionInfo *exception, Image *image )
(void) image; (void) image;
} }
void
magick_set_number_scenes( ImageInfo *image_info, int scene, int number_scenes )
{
/* I can't find docs for these fields, but this seems to work.
*/
char page[256];
image_info->scene = scene;
image_info->number_scenes = number_scenes;
/* Some IMs must have the string version set as well.
*/
vips_snprintf( page, 256, "%d-%d", scene, scene + number_scenes );
image_info->scenes = strdup( page );
}
#endif /*HAVE_MAGICK7*/ #endif /*HAVE_MAGICK7*/
#ifdef HAVE_MAGICK6 #ifdef HAVE_MAGICK6
@ -186,19 +202,6 @@ magick_inherit_exception( ExceptionInfo *exception, Image *image )
#endif /*HAVE_INHERITEXCEPTION*/ #endif /*HAVE_INHERITEXCEPTION*/
} }
#endif /*HAVE_MAGICK6*/
#if defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)
void
magick_set_image_option( ImageInfo *image_info,
const char *name, const char *value )
{
#ifdef HAVE_SETIMAGEOPTION
SetImageOption( image_info, name, value );
#endif /*HAVE_SETIMAGEOPTION*/
}
void void
magick_set_number_scenes( ImageInfo *image_info, int scene, int number_scenes ) magick_set_number_scenes( ImageInfo *image_info, int scene, int number_scenes )
{ {
@ -222,6 +225,19 @@ magick_set_number_scenes( ImageInfo *image_info, int scene, int number_scenes )
#endif #endif
} }
#endif /*HAVE_MAGICK6*/
#if defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)
void
magick_set_image_option( ImageInfo *image_info,
const char *name, const char *value )
{
#ifdef HAVE_SETIMAGEOPTION
SetImageOption( image_info, name, value );
#endif /*HAVE_SETIMAGEOPTION*/
}
void void
magick_vips_error( const char *domain, ExceptionInfo *exception ) magick_vips_error( const char *domain, ExceptionInfo *exception )
{ {