(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 7a371324a5f82de8fa621b8b5b26152026ce9f7a..9812d2b9975fc88027bc2d54aca62d249107a8bf 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -1512,7 +1512,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel,
           alpha=(MagickRealType) (QuantumScale*pixel.alpha);
           return(alpha);
         }
-        case DefaultPixelChannels:
+        case IntensityPixelChannel:
         {
           return(QuantumScale*GetPixelInfoIntensity(&pixel));
         }

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 66751f8704468c1dfc46219b09148f1d97092e0a..185eda2d6eb2937dd6df20e42f7363ace0af0fb9 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -56,7 +56,9 @@ typedef enum
   AlphaPixelChannel = 3,
   BlackPixelChannel = 4,
   IndexPixelChannel = 4,
-  MaskPixelChannel = 5
+  MaskPixelChannel = 5,
+  IntensityPixelChannel = MaxPixelChannels,
+  SyncPixelChannel = MaxPixelChannels+1
 } PixelChannel;
 
 typedef enum

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 1c5e26bac37a36d60034fd3291d645cc0b3c41a9..afe15293be5284aafa635b1f6f057c80d79f6a60 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2014,7 +2014,7 @@ MagickExport const char *GetImageProperty(const Image *image,
       if (LocaleNCompare("fx:",property,3) == 0)
         {
           fx_info=AcquireFxInfo(image,property+3);
-          status=FxEvaluateChannelExpression(fx_info,DefaultPixelChannels,0,0,
+          status=FxEvaluateChannelExpression(fx_info,IntensityPixelChannel,0,0,
             &alpha,exception);
           fx_info=DestroyFxInfo(fx_info);
           if (status != MagickFalse)