From 2bddff8106ae876a48d74306d1596900ffa0e7da Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 25 Jul 2011 18:39:12 +0000 Subject: [PATCH] --- MagickCore/fx.c | 2 +- MagickCore/pixel.h | 4 +++- MagickCore/property.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 7a371324a..9812d2b99 100644 --- 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 66751f870..185eda2d6 100644 --- 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 1c5e26bac..afe15293b 100644 --- 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) -- 2.40.0