(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 8cb53f65500821a449cbd83bbba2eb7403d97d31..6e58ff3058bf08e42f89bef3754d62b2e4b38e75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
   * Miscellany->Slide Show, in the display program, now cycles through the
     image sequence.
   * Recognize certain hex color values (e.g. #b9e1cc00) for the -fx argument.
+  * Recognize fxc: namespace.  Use it if the FX expression is a constant.
 
 2010-06-14  6.6.2-5 Anthony Thyssen <A.Thyssen@griffith...>
   * Fix transprancy handling for Morphology Convolve

diff --git a/magick/property.c b/magick/property.c
index b8221ab1583da54348dd46d591fb827d6e42a9bf..20c61e971e504a5e50c158849f28d2c3f21be2dd 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2022,9 +2022,11 @@ MagickExport const char *GetImageProperty(const Image *image,
     case 'F':
     case 'f':
     {
-      if (LocaleNCompare("fx:",property,3) == 0)
+      if ((LocaleNCompare("fx:",property,3) == 0) ||
+          (LocaleNCompare("fxc:",property,4) == 0))
         {
-          fx_info=AcquireFxInfo(image,property+3);
+          fx_info=AcquireFxInfo(image,property+
+            (LocaleNCompare("fx:",property,3) == 0 ? 3 : 4));
           status=FxEvaluateExpression(fx_info,&alpha,exception);
           fx_info=DestroyFxInfo(fx_info);
           if (status != MagickFalse)