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

Added define for loading with ImageMagick.

Browse Source
This commit is contained in:
Dirk Lemstra 2017-12-22 01:55:26 +01:00
parent 383125a031
commit 90167902b9
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvips/foreign/foreign.c
View File

@ -1879,15 +1879,22 @@ vips_foreign_operation_init( void )
vips_foreign_load_openslide_get_type();
#endif /*HAVE_OPENSLIDE*/
#ifdef HAVE_MAGICK
vips_foreign_load_magick_file_get_type();
vips_foreign_load_magick_buffer_get_type();
#endif /*HAVE_MAGICK*/
/* Should be removed and added as a configure option */
#define HAVE_MAGICKLOAD 1
#define HAVE_MAGICKSAVE 1
/* Should be removed and added as a configure option */
#ifdef HAVE_MAGICK7
vips_foreign_load_magick7_file_get_type();
vips_foreign_load_magick7_buffer_get_type();
#endif /*HAVE_MAGICK7*/
#ifdef HAVE_MAGICKLOAD
#ifdef HAVE_MAGICK
vips_foreign_load_magick_file_get_type();
vips_foreign_load_magick_buffer_get_type();
#endif /*HAVE_MAGICK*/
#ifdef HAVE_MAGICK7
vips_foreign_load_magick7_file_get_type();
vips_foreign_load_magick7_buffer_get_type();
#endif /*HAVE_MAGICK7*/
#endif /*HAVE_MAGICKLOAD*/
#ifdef HAVE_MAGICKSAVE
vips_foreign_save_magick_file_get_type();

7
libvips/foreign/magick2vips.c
View File

@ -93,6 +93,11 @@
#endif /*HAVE_CONFIG_H*/
#include <vips/intl.h>
/* Should be removed and added as a configure option */
#define HAVE_MAGICKLOAD 1
/* Should be removed and added as a configure option */
#ifdef HAVE_MAGICKLOAD
#ifdef HAVE_MAGICK
#include <stdio.h>
@ -893,4 +898,4 @@ vips__magick_read_buffer_header( const void *buf, const size_t len,
}
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICKLOAD*/

6
libvips/foreign/magick7load.c
View File

@ -50,6 +50,11 @@
#include <vips/buf.h>
#include <vips/internal.h>
/* Should be removed and added as a configure option */
#define HAVE_MAGICKLOAD 1
/* Should be removed and added as a configure option */
#ifdef HAVE_MAGICKLOAD
#ifdef HAVE_MAGICK7
#include <MagickCore/MagickCore.h>
@ -911,3 +916,4 @@ vips_foreign_load_magick7_buffer_init( VipsForeignLoadMagick7Buffer *buffer )
}
#endif /*HAVE_MAGICK7*/
#endif /*HAVE_MAGICKLOAD*/

6
libvips/foreign/magickload.c
View File

@ -58,6 +58,11 @@
#include <vips/buf.h>
#include <vips/internal.h>
/* Should be removed and added as a configure option */
#define HAVE_MAGICKLOAD 1
/* Should be removed and added as a configure option */
#ifdef HAVE_MAGICKLOAD
#ifdef HAVE_MAGICK
#include "pforeign.h"
@ -325,6 +330,7 @@ vips_foreign_load_magick_buffer_init( VipsForeignLoadMagickBuffer *buffer )
}
#endif /*HAVE_MAGICK*/
#endif /*HAVE_MAGICKLOAD*/
/**
* vips_magickload: