(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 9db39325a4dd535481050b722e6c7cc00e5512a1..7536875c87127d537e64ed1aeb45714fc322670d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 2010-11-08  6.6.5-8 Cristy  <quetzlzacatenango@image...>
   * Only save TIFF image with 1-bit depth if there is no alpha channel.
   * Abandon PSD composite if layer is available.
+  * %[fx:mean] is the mean of the default channels (all but opacity) (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=17432).
 
 2010-10-29  6.6.5-6 Glenn Randers-Pehrson <glennrp@image...>
   * Added 5x5, 6x6, and 7x7 ordered-dither level maps.

diff --git a/magick/property.c b/magick/property.c
index e53e27aa845ea32686c984cefcb3622f02995f8e..3d73bc118c73536dc77583e5793449c149cedb9e 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2025,7 +2025,8 @@ MagickExport const char *GetImageProperty(const Image *image,
       if (LocaleNCompare("fx:",property,3) == 0)
         {
           fx_info=AcquireFxInfo(image,property+3);
-          status=FxEvaluateExpression(fx_info,&alpha,exception);
+          status=FxEvaluateChannelExpression(fx_info,DefaultChannels,0,0,&alpha,
+            exception);
           fx_info=DestroyFxInfo(fx_info);
           if (status != MagickFalse)
             {