(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index a94ebb42cbbb0c5f164803ddbe84d45f3ef46356..5886e439f97847d22d75c55a46dbd15e54fcc3dc 100644 (file)
--- 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 2704a86c2201c528c89b6d8f55689a7f7d94b5e7..1939b420be780f76fbeb32e5cbb392bca134851b 100644 (file)
--- 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));
 }
 \f

diff --git a/coders/mask.c b/coders/mask.c
index e22d1427d28983587cf99f037779daa598c01ab5..154120006abe6c99d800c4f24defe47a862c007a 100644 (file)
--- 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)