]> granicus.if.org Git - imagemagick/commitdiff
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28412
authorCristy <urban-warrior@imagemagick.org>
Sun, 27 Sep 2015 14:47:45 +0000 (10:47 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 27 Sep 2015 14:47:45 +0000 (10:47 -0400)
coders/clip.c
coders/histogram.c
coders/mask.c
coders/preview.c
coders/thumbnail.c
coders/vid.c

index 275d5b9530a4764b11678808ce2ad30c21f2ae60..9466e4f65f045c4b2b8f99b31353a3999c3941cb 100644 (file)
@@ -232,8 +232,10 @@ static MagickBooleanType WriteCLIPImage(const ImageInfo *image_info,
   clip_image=GetImageMask(image,exception);
   if (clip_image == (Image *) NULL)
     return(MagickFalse);
-  (void) CopyMagickString(clip_image->filename,image->filename,MagickPathExtent);
+  (void) CopyMagickString(clip_image->filename,image->filename,
+    MagickPathExtent);
   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,MagickPathExtent,"miff:%s",
index 0fb2780e9e2fc8de810813b864b6e6b6535c57ad..bb70b22c5bdc930999d25c99f015d9f478fe761e 100644 (file)
@@ -369,10 +369,11 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   (void) CopyMagickString(histogram_image->filename,image_info->filename,
     MagickPathExtent);
   write_info=CloneImageInfo(image_info);
+  *write_info->magick='\0';
   (void) SetImageInfo(write_info,1,exception);
   if (LocaleCompare(write_info->magick,"HISTOGRAM") == 0)
-    (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,"miff:%s",
-      write_info->filename);
+    (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,
+      "miff:%s",write_info->filename);
   status=WriteImage(write_info,histogram_image,exception);
   histogram_image=DestroyImage(histogram_image);
   write_info=DestroyImageInfo(write_info);
index 1b317f5bb3c1354b8c929605d0cc2021b0f170f6..ee715e1b6cbe0fd8807d82a5567eaada87f31626 100644 (file)
@@ -297,8 +297,10 @@ static MagickBooleanType WriteMASKImage(const ImageInfo *image_info,
   mask_image=MaskImage(image,exception);
   if (mask_image == (Image *) NULL)
     return(MagickFalse);
-  (void) CopyMagickString(mask_image->filename,image->filename,MagickPathExtent);
+  (void) CopyMagickString(mask_image->filename,image->filename,
+    MagickPathExtent);
   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,MagickPathExtent,"miff:%s",
index baaab5530ca83005622edc9c65015936b0fcefe9..14354b89ed3346c86d5b657edc35b9e51658fdae 100644 (file)
@@ -187,6 +187,7 @@ static MagickBooleanType WritePreviewImage(const ImageInfo *image_info,
   (void) CopyMagickString(preview_image->filename,image_info->filename,
     MagickPathExtent);
   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,MagickPathExtent,
index 07dd0a1960e299fe8e0ff5b141a684048bcf2a4a..46db7c8c660708d2b9b20abb6e6a60e84c964e08 100644 (file)
@@ -208,6 +208,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info,
   (void) CopyMagickString(thumbnail_image->filename,image->filename,
     MagickPathExtent);
   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,MagickPathExtent,
index 0872107694c20e9c12a169b969f5e7113b6623da..1cdac5729fc79b2bde281fd60e9f34ee386425da 100644 (file)
@@ -333,6 +333,7 @@ static MagickBooleanType WriteVIDImage(const ImageInfo *image_info,Image *image,
   (void) CopyMagickString(montage_image->filename,image_info->filename,
     MagickPathExtent);
   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,MagickPathExtent,