(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 183ec240fbe22d7f392eea94b7cf904172bc62cf..93b0e913ce1aeb541b91dcafea7d2041591c0e53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-14  6.6.6-6 Cristy  <quetzlzacatenango@image...>
+  * -format "%[fx:u.p{5,5}]" no longer reports parse exception (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=17678).
+
 2010-12-12  6.6.6-6 Glenn Randers-Pehrson <glennrp@image...>
   * Eliminated a redundant quantization step in the PNG encoder.
     Untangled a confusing but apparently harmless improper loop nesting

diff --git a/magick/fx.c b/magick/fx.c
index c88c313d7df0f301c561db2a7fe4ac8fd6b12d6d..18dbb1b467b7c266c9c7e3d70dd5db8099281a93 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -1518,6 +1518,10 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
             }
           return(QuantumScale*pixel.index);
         }
+        case DefaultChannels: 
+        {
+          return(QuantumScale*MagickPixelIntensityToQuantum(&pixel));
+        }
         default:
           break;
       }