(no commit message)

diff --git a/magick/fx.c b/magick/fx.c
index 5c966f2153124191861ca15d429239af48a48955..c8fadd90c575c3d1260b97efcf92c0b582fdbfb3 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -2783,7 +2783,8 @@ MagickExport MagickBooleanType FxEvaluateExpression(FxInfo *fx_info,
   MagickBooleanType
     status;
 
-  status=FxEvaluateChannelExpression(fx_info,GrayChannel,0,0,alpha,exception);
+  status=FxEvaluateChannelExpression(fx_info,DefaultChannels,0,0,alpha,
+    exception);
   return(status);
 }
 

diff --git a/magick/property.c b/magick/property.c
index 3d73bc118c73536dc77583e5793449c149cedb9e..4f1589dad4ccc92bdbdfabd983f2289aba85fff5 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -1668,7 +1668,7 @@ static char *TracePSClippath(const unsigned char *blob,size_t length,
         */
         for (i=0; i < 3; i++)
         {
-          size_t 
+          size_t
             xx,
             yy;
 
@@ -2025,8 +2025,7 @@ MagickExport const char *GetImageProperty(const Image *image,
       if (LocaleNCompare("fx:",property,3) == 0)
         {
           fx_info=AcquireFxInfo(image,property+3);
-          status=FxEvaluateChannelExpression(fx_info,DefaultChannels,0,0,&alpha,
-            exception);
+          status=FxEvaluateExpression(fx_info,0,0,&alpha,exception);
           fx_info=DestroyFxInfo(fx_info);
           if (status != MagickFalse)
             {
@@ -2432,7 +2431,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
     {
       if (LocaleNCompare("width",property,5) == 0)
         {
-          (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double) 
+          (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double)
             (image->magick_columns != 0 ? image->magick_columns : 256));
           break;
         }