From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 10 Nov 2010 14:03:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13b9a2ed4ee4d5e1b7b87f83be7e6b8580285fda;p=imagemagick

---

diff --git a/magick/fx.c b/magick/fx.c
index 5c966f215..c8fadd90c 100644
--- 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 3d73bc118..4f1589dad 100644
--- 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;
         }