From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 12 Jun 2010 19:07:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=212e262c842c16f5e9d1f2176b5d5b30a3f59e39;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 73931ad7b..a5bfa609d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  6.6.2-5 Cristy  <quetzlzacatenango@image...>
+  * mogrify -format properly handles compressed image filename (e.g.
+    -format jpg logo.png.bz2).
+
 2010-06-12  6.6.2-5 Anthony Thyssen <A.Thyssen@griffith...>
   * Fix transprancy handling for Morphology Convolve
   * Adjustments of Hit And Miss and Edge Detection kernel definitions
diff --git a/magick/utility.c b/magick/utility.c
index b39ec95e3..2a187c0ca 100644
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -266,6 +266,7 @@ MagickExport MagickBooleanType AcquireUniqueSymbolicLink(const char *source,
 MagickExport void AppendImageFormat(const char *format,char *filename)
 {
   char
+    extension[MaxTextExtent],
     root[MaxTextExtent];
 
   assert(format != (char *) NULL);
@@ -282,6 +283,20 @@ MagickExport void AppendImageFormat(const char *format,char *filename)
       (void) CopyMagickString(filename,message,MaxTextExtent);
       return;
     }
+  GetPathComponent(filename,ExtensionPath,extension);
+  if ((LocaleCompare(extension,"Z") == 0) ||
+      (LocaleCompare(extension,"bz2") == 0) ||
+      (LocaleCompare(extension,"gz") == 0) ||
+      (LocaleCompare(extension,"wmz") == 0) ||
+      (LocaleCompare(extension,"svgz") == 0))
+    {
+      GetPathComponent(filename,RootPath,root);
+      (void) CopyMagickString(filename,root,MaxTextExtent);
+      GetPathComponent(filename,RootPath,root);
+      (void) FormatMagickString(filename,MaxTextExtent,"%s.%s.%s",root,format,
+        extension);
+      return;
+    }
   GetPathComponent(filename,RootPath,root);
   (void) FormatMagickString(filename,MaxTextExtent,"%s.%s",root,format);
 }
diff --git a/wand/mogrify.c b/wand/mogrify.c
index 6a420c762..bf8077b54 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -4062,7 +4062,11 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               path,*DirectorySeparator,filename);
           }
         if (format != (char *) NULL)
-          AppendImageFormat(format,images->filename);
+          {
+            (void) CopyMagickString(images->filename,images->magick_filename,
+              MaxTextExtent);
+            AppendImageFormat(format,images->filename);
+          }
         AppendImageStack(images);
         FinalizeImageSettings(image_info,image,MagickFalse);
         if (global_colormap != MagickFalse)