diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-22 22:11:10 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-22 22:11:10 +0000 |
| commit | 7c4077fc7906cd4774efd0e38049f52ff6579fa9 (patch) | |
| tree | 74e8c7b7e8a405483cb0ef20980b19c8fc0a7904 /src | |
| parent | 720907d87e05be999f02096ef9220c2638defdc4 (diff) | |
| parent | cb766fad28e81704d6408aab27beacd976cd1731 (diff) | |
| download | xine-lib-7c4077fc7906cd4774efd0e38049f52ff6579fa9.tar.gz xine-lib-7c4077fc7906cd4774efd0e38049f52ff6579fa9.tar.bz2 | |
Merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libxinevdec/image.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index d8064d200..5e166382b 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -54,6 +54,17 @@ #include "xineutils.h" #include "bswap.h" +#ifdef HAVE_GRAPHICSMAGICK +# define MAGICK_VERSION 0x670 +#else +# if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +# define MAGICK_VERSION 0x670 +#else +# define MAGICK_VERSION MagickLibVersion +# endif +#endif + + typedef struct { video_decoder_class_t decoder_class; @@ -101,7 +112,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { /* * this->image -> rgb data */ -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 InitializeMagick(NULL); #else MagickWandGenesis(); @@ -113,7 +124,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (!status) { DestroyMagickWand(wand); -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 DestroyMagick(); #else MagickWandTerminus(); @@ -125,7 +136,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ height = MagickGetImageHeight(wand); img_buf = malloc(width * height * 3); -#if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +#if MAGICK_VERSION < 0x671 MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); DestroyMagickWand(wand); DestroyMagick(); |