(no commit message)

diff --git a/coders/clip.c b/coders/clip.c
index 1939b420be780f76fbeb32e5cbb392bca134851b..c02589fe4349710dc2c2ca5d3bb90ef890a63140 100644 (file)
--- 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 24aa7388fe392fb50b450eb3a0070fad050f5d82..5a99c468c95a2e15b74dc57de3508b2e0a905b0a 100644 (file)
--- 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 154120006abe6c99d800c4f24defe47a862c007a..fafe68148727cbb64095f30ad6bd6872fada3469 100644 (file)
--- 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 018486c61f60c78e0eda9322da8de60070c25a63..9a0a49837599d2f68b61d330cc24203cacfad656 100644 (file)
--- 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 9b59e1d239a9efc4c0a9206f7386dc08f1ade22b..02ff75f9a58e4ff87822e9eaa843e6d3b0b7fb58 100644 (file)
--- 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 d27afcf78d5be9a250f15a861836665988b49019..90eba4bc4be9f8079261142fa62ce2085d49b129 100644 (file)
--- 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 8a5cdd6333b14d7dbec3abdf1174458c6408a554..a4172730b11f390e70bf9c4da2cfb7b6c79a41c4 100644 (file)
--- 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,