From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 31 Mar 2015 13:54:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1aa02e23d93767211ed28e3b51b00b9193a8356;p=imagemagick

---

diff --git a/coders/clip.c b/coders/clip.c
index 1939b420b..c02589fe4 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -236,7 +236,6 @@ static MagickBooleanType WriteCLIPImage(const ImageInfo *image_info,
     return(MagickFalse);
   (void) CopyMagickString(clip_image->filename,image->filename,MaxTextExtent);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"CLIP") == 0)
     (void) FormatLocaleString(clip_image->filename,MaxTextExtent,"miff:%s",
diff --git a/coders/ept.c b/coders/ept.c
index 24aa7388f..5a99c468c 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -402,7 +402,6 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image,
   if (write_image == (Image *) NULL)
     return(MagickFalse);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) CopyMagickString(write_info->magick,"EPS",MaxTextExtent);
   if (LocaleCompare(image_info->magick,"EPT2") == 0)
     (void) CopyMagickString(write_info->magick,"EPS2",MaxTextExtent);
diff --git a/coders/mask.c b/coders/mask.c
index 154120006..fafe68148 100644
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -301,7 +301,6 @@ static MagickBooleanType WriteMASKImage(const ImageInfo *image_info,
     return(MagickFalse);
   (void) CopyMagickString(mask_image->filename,image->filename,MaxTextExtent);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"MASK") == 0)
     (void) FormatLocaleString(mask_image->filename,MaxTextExtent,"miff:%s",
diff --git a/coders/matte.c b/coders/matte.c
index 018486c61..9a0a49837 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -211,9 +211,9 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
       break;
   }
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
-  (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
-    "MIFF:%s",image->filename);
+  if (LocaleCompare(write_info->magick,"MATTE") == 0)
+    (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
+      "MIFF:%s",image->filename);
   status=WriteImage(write_info,matte_image,exception);
   write_info=DestroyImageInfo(write_info);
   matte_image=DestroyImage(matte_image);
diff --git a/coders/preview.c b/coders/preview.c
index 9b59e1d23..02ff75f9a 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -189,7 +189,6 @@ static MagickBooleanType WritePreviewImage(const ImageInfo *image_info,
   (void) CopyMagickString(preview_image->filename,image_info->filename,
     MaxTextExtent);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"PREVIEW") == 0)
     (void) FormatLocaleString(preview_image->filename,MaxTextExtent,
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index d27afcf78..90eba4bc4 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -210,7 +210,6 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
   (void) CopyMagickString(thumbnail_image->filename,image->filename,
     MaxTextExtent);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"THUMBNAIL") == 0)
     (void) FormatLocaleString(thumbnail_image->filename,MaxTextExtent,
diff --git a/coders/vid.c b/coders/vid.c
index 8a5cdd633..a4172730b 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -335,7 +335,6 @@ static MagickBooleanType WriteVIDImage(const ImageInfo *image_info,Image *image,
   (void) CopyMagickString(montage_image->filename,image_info->filename,
     MaxTextExtent);
   write_info=CloneImageInfo(image_info);
-  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"VID") == 0)
     (void) FormatLocaleString(montage_image->filename,MaxTextExtent,