(no commit message)

diff --git a/ChangeLog b/ChangeLog
index df200bf7fa3243304c9251777f38e1bbe5c57732..647cb76987aec17f8ff513b08d180bff8b82e63d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
   * Respect density when rendering SVG images.
   * Set AVI handler to the MPEG coder.
   * Compute the proper DPX user data field size.
+  * Do not interpret a format specifier when enclosed in brackets (e.g.
+    rose_tile_%[filename:tile].gif.
 
 2010-05-23  6.6.2.0 Anthony Thyssen <A.Thyssen@griffith...>
   * Third Re-write of MorphologyApply() to better handle compound methods.

diff --git a/magick/utility.c b/magick/utility.c
index 8e406d36d27d692ec120a8b91ca726956cdfc5fc..1a7c849b1b7a0e9e1752d4586c6514de41e9814f 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -1288,6 +1288,13 @@ MagickExport void GetPathComponent(const char *path,PathType type,
   if (path[1] != ":")
 #endif
   for (p=component; *p != '\0'; p++)
+  {
+    if ((*p == '%') && (*(p+1) == '['))
+      {
+        for (p++; (*p != ']') && (*p != '\0'); p++) ;
+        if (*p == '\0')
+          break;
+      }
     if ((*p == ':') && (IsPathDirectory(path) < 0) &&
         (IsPathAccessible(path) == MagickFalse))
       {
@@ -1302,6 +1309,7 @@ MagickExport void GetPathComponent(const char *path,PathType type,
             *q=(*++p);
         break;
       }
+  }
   *subimage='\0';
   p=component;
   if (*p != '\0')