From 0ee56451aaed815fc4c38c9b30471c1c9ee7855a Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 23 Apr 2011 21:40:55 +0000 Subject: [PATCH] --- magick/pixel.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/magick/pixel.c b/magick/pixel.c index 69a3cf70c..b54636477 100644 --- a/magick/pixel.c +++ b/magick/pixel.c @@ -3461,7 +3461,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, */ static inline void AlphaBlendMagickPixelPacket(const Image *image, - const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel, + const PixelPacket *color,const IndexPacket *indexes,MagickPixelPacket *pixel, MagickRealType *alpha) { if (image->matte == MagickFalse) @@ -3474,20 +3474,20 @@ static inline void AlphaBlendMagickPixelPacket(const Image *image, pixel->index=0.0; if (((image->colorspace == CMYKColorspace) || (image->storage_class == PseudoClass)) && - (index != (const IndexPacket *) NULL)) - pixel->index=(MagickRealType) *index; + (indexes != (const IndexPacket *) NULL)) + pixel->index=(MagickRealType) GetIndexPixelComponent(indexes); return; } *alpha=QuantumScale*GetAlphaPixelComponent(color); - pixel->red=(MagickRealType) (*alpha*GetRedPixelComponent(color)); - pixel->green=(MagickRealType) (*alpha*GetGreenPixelComponent(color)); - pixel->blue=(MagickRealType) (*alpha*GetBluePixelComponent(color)); + pixel->red=(*alpha*GetRedPixelComponent(color)); + pixel->green=(*alpha*GetGreenPixelComponent(color)); + pixel->blue=(*alpha*GetBluePixelComponent(color)); pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color); pixel->index=0.0; if (((image->colorspace == CMYKColorspace) || (image->storage_class == PseudoClass)) && - (index != (const IndexPacket *) NULL)) - pixel->index=(MagickRealType) (*alpha*(*index)); + (indexes != (const IndexPacket *) NULL)) + pixel->index=(*alpha*GetIndexPixelComponent(indexes)); } static void BicubicInterpolate(const MagickPixelPacket *pixels,const double dx, -- 2.40.0