From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 22 Apr 2010 13:50:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9613
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecbe37f4ebcb73a6eb7c3797ce4184206dbd9881;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 8b8ae1ab3..7c216f3db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
   * For the histogram: format, if you have no need for the unique color list,
     use <kbd>-define histogram:unique-colors=false</kbd> to forego this
     expensive operation.
+  * Match on literal after backslash in glob expression (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16068).
 
 2010-04-15  6.6.1-4 Cristy  <quetzlzacatenango@image...>
   * Do not set the resample virtual pixel method when undefined.
diff --git a/magick/token.c b/magick/token.c
index 7dc28cb54..dbffcef71 100644
--- a/magick/token.c
+++ b/magick/token.c
@@ -364,13 +364,6 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
         break;
     switch (GetUTFCode(pattern))
     {
-      case '\\':
-      {
-        pattern+=GetUTFOctets(pattern);
-        if (GetUTFCode(pattern) != 0)
-          pattern+=GetUTFOctets(pattern);
-        break;
-      }
       case '*':
       {
         MagickBooleanType
@@ -533,6 +526,12 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
           }
         break;
       }
+      case '\\':
+      {
+        pattern+=GetUTFOctets(pattern);
+        if (GetUTFCode(pattern) != 0)
+          pattern+=GetUTFOctets(pattern);
+      }
       default:
       {
         if (case_insensitive != MagickFalse)