(no commit message)

diff --git a/coders/clip.c b/coders/clip.c
index a86823157cb0d13857c4cdb3f7ef216a52d3a27b..2704a86c2201c528c89b6d8f55689a7f7d94b5e7 100644 (file)
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -232,6 +232,7 @@ 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/mask.c b/coders/mask.c
index 65393bed56380d98a7f2907f64a08ad5c0dcbb76..e22d1427d28983587cf99f037779daa598c01ab5 100644 (file)
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -301,6 +301,7 @@ 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 83de61dd9660873c0273989716ed2ce0b0016088..018486c61f60c78e0eda9322da8de60070c25a63 100644 (file)
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -160,6 +160,9 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
   Image
     *matte_image;
 
+  ImageInfo
+    *write_info;
+
   MagickBooleanType
     status;
 
@@ -207,9 +210,12 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
     if (status == MagickFalse)
       break;
   }
+  write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
     "MIFF:%s",image->filename);
-  status=WriteImage(image_info,matte_image,exception);
+  status=WriteImage(write_info,matte_image,exception);
+  write_info=DestroyImageInfo(write_info);
   matte_image=DestroyImage(matte_image);
   return(status);
 }

diff --git a/coders/preview.c b/coders/preview.c
index 02ff75f9a58e4ff87822e9eaa843e6d3b0b7fb58..9b59e1d239a9efc4c0a9206f7386dc08f1ade22b 100644 (file)
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -189,6 +189,7 @@ 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 5bfa07e90031e2bfef7d6d73b8b6572e30f84648..d27afcf78d5be9a250f15a861836665988b49019 100644 (file)
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -205,11 +205,12 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
     length,exception);
   if (thumbnail_image == (Image *) NULL)
     return(MagickFalse);
-  (void) SetImageType(thumbnail_image,thumbnail_image->alpha_trait == UndefinedPixelTrait ?
-    TrueColorType : TrueColorAlphaType,exception);
+  (void) SetImageType(thumbnail_image,thumbnail_image->alpha_trait ==
+    UndefinedPixelTrait ? TrueColorType : TrueColorAlphaType,exception);
   (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 a4172730b11f390e70bf9c4da2cfb7b6c79a41c4..8a5cdd6333b14d7dbec3abdf1174458c6408a554 100644 (file)
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -335,6 +335,7 @@ 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,

diff --git a/coders/xtrn.c b/coders/xtrn.c
index cae16be56e5f06d79a21a719e66ee9f9f6c221bd..cf42ce35b1833ef584219dc2203ab03ede497572 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -428,7 +428,8 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
   if (LocaleCompare(image_info->magick,"XTRNFILE") == 0)
     {
       clone_info=CloneImageInfo(image_info);
-      status=WriteImage(image_info,image,exception);
+      *clone_info->magick='\0';
+      status=WriteImage(clone_info,image,exception);
       if (status == MagickFalse)
         CatchImageException(image);
       clone_info=DestroyImageInfo(clone_info);