From 20425988dde5f0107f0f2dfe9f1c72adf0ad7365 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 15 Mar 2015 22:14:05 +0000 Subject: [PATCH] --- MagickCore/version.h | 2 +- coders/clip.c | 24 ++++++++++++++---------- coders/mask.c | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index a94ebb42c..5886e439f 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2015-02-28" +#define MagickReleaseDate "2015-03-15" #define MagickChangeDate "20120427" #define MagickAuthoritativeLicense \ "http://www.imagemagick.org/script/license.php" diff --git a/coders/clip.c b/coders/clip.c index 2704a86c2..1939b420b 100644 --- a/coders/clip.c +++ b/coders/clip.c @@ -91,7 +91,6 @@ static Image *ReadCLIPImage(const ImageInfo *image_info, ExceptionInfo *exception) { Image - *clip_image, *image; ImageInfo @@ -109,16 +108,21 @@ static Image *ReadCLIPImage(const ImageInfo *image_info, assert(exception->signature == MagickSignature); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - *read_info->magick='\0'; - clip_image=ReadImage(read_info,exception); + (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent); + image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); - if (clip_image == (Image *) NULL) - return((Image *) NULL); - (void) ClipImage(clip_image,exception); - image=GetImageMask(clip_image,exception); - clip_image=DestroyImage(clip_image); - if (image == (Image *) NULL) - ThrowReaderException(CoderError,"ImageDoesNotHaveAClipMask"); + if (image != (Image *) NULL) + { + Image + *clip_image; + + (void) ClipImage(image,exception); + clip_image=GetImageMask(image,exception); + if (clip_image == (Image *) NULL) + ThrowReaderException(CoderError,"ImageDoesNotHaveAClipMask"); + image=DestroyImage(image); + image=clip_image; + } return(GetFirstImageInList(image)); } diff --git a/coders/mask.c b/coders/mask.c index e22d1427d..154120006 100644 --- a/coders/mask.c +++ b/coders/mask.c @@ -110,7 +110,7 @@ static Image *ReadMASKImage(const ImageInfo *image_info, assert(exception->signature == MagickSignature); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - *read_info->magick='\0'; + (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) -- 2.40.0