(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 8b8ae1ab3ba1e37d7fe2d2a2613c167c2dd17671..7c216f3db67a404ae4ac1aaf9557ac146017304f 100644 (file)
--- 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 7dc28cb5498966d907d4c9d8e5df7ff0a931afa0..dbffcef71efb594c41169cdb1a66bf720f61243f 100644 (file)
--- 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)