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

rename HAVE_MAGICK as HAVE_MAGICK6

Browse Source 
clearer meaning
This commit is contained in:
John Cupitt 2017-12-23 17:13:44 +00:00
parent 585469b192
commit 8d08255ff7
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -586,7 +586,7 @@ if test x"$with_magick" != x"no"; then
PACKAGES_USED="$PACKAGES_USED $with_magickpackage"
],
[PKG_CHECK_MODULES(MAGICK, $with_magickpackage,
[AC_DEFINE(HAVE_MAGICK,1,[define if you have libMagick installed.])
[AC_DEFINE(HAVE_MAGICK6,1,[define if you have libMagick6 installed.])
with_magick=yes
magick6=yes
magick_version=magick6

4
libvips/foreign/foreign.c
View File

@ -1880,10 +1880,10 @@ vips_foreign_operation_init( void )
#endif /*HAVE_OPENSLIDE*/
#ifdef ENABLE_MAGICKLOAD
#ifdef HAVE_MAGICK
#ifdef HAVE_MAGICK6
vips_foreign_load_magick_file_get_type();
vips_foreign_load_magick_buffer_get_type();
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/
#ifdef HAVE_MAGICK7
vips_foreign_load_magick7_file_get_type();

6
libvips/foreign/magick.c
View File

@ -98,7 +98,7 @@ magick_inherit_exception( ExceptionInfo *exception, Image *image )
#endif /*HAVE_MAGICK7*/
#ifdef HAVE_MAGICK
#ifdef HAVE_MAGICK6
Image*
magick_acquire_image(const ImageInfo *image_info, ExceptionInfo *exception)
@ -155,9 +155,9 @@ magick_inherit_exception( ExceptionInfo *exception, Image *image )
InheritException( exception, &image->exception );
}
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/
#if defined(HAVE_MAGICK) || defined(HAVE_MAGICK7)
#if defined(HAVE_MAGICK6) || defined(HAVE_MAGICK7)
void
magick_vips_error( const char *domain, ExceptionInfo *exception )

8
libvips/foreign/magick.h
View File

@ -30,12 +30,12 @@
*/
#if defined(HAVE_MAGICK) || defined (HAVE_MAGICK7)
#if defined(HAVE_MAGICK6) || defined (HAVE_MAGICK7)
#ifdef HAVE_MAGICK
#ifdef HAVE_MAGICK6
#include <magick/api.h>
#define MaxPathExtent MaxTextExtent
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/
#ifdef HAVE_MAGICK7
#include <MagickCore/MagickCore.h>
@ -59,4 +59,4 @@ void magick_vips_error( const char *domain, ExceptionInfo *exception );
void magick_genesis( void );
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/

4
libvips/foreign/magick2vips.c
View File

@ -95,7 +95,7 @@
#ifdef ENABLE_MAGICKLOAD
#ifdef HAVE_MAGICK
#ifdef HAVE_MAGICK6
#include <stdio.h>
#include <stdlib.h>
@ -894,6 +894,6 @@ vips__magick_read_buffer_header( const void *buf, const size_t len,
return( 0 );
}
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/
#endif /*ENABLE_MAGICKLOAD*/

4
libvips/foreign/magickload.c
View File

@ -60,7 +60,7 @@
#ifdef ENABLE_MAGICKLOAD
#ifdef HAVE_MAGICK
#ifdef HAVE_MAGICK6
#include "pforeign.h"
@ -326,7 +326,7 @@ vips_foreign_load_magick_buffer_init( VipsForeignLoadMagickBuffer *buffer )
{
}
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICK6*/
#endif /*ENABLE_MAGICKLOAD*/