From 2261ef5d3357ed9869714c3313b0c657f2409e80 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 25 May 2010 13:11:55 +0000 Subject: [PATCH] --- ChangeLog | 2 ++ magick/utility.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index df200bf7f..647cb7698 100644 --- 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 * Third Re-write of MorphologyApply() to better handle compound methods. diff --git a/magick/utility.c b/magick/utility.c index 8e406d36d..1a7c849b1 100644 --- 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') -- 2.40.0