From d8f471aa38e9e94cc5ce88068706e3da93d22a89 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 11 Nov 2011 01:49:15 +0000 Subject: [PATCH] --- MagickCore/pixel-private.h | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h index 5b4512f9b..dc517bcf3 100644 --- a/MagickCore/pixel-private.h +++ b/MagickCore/pixel-private.h @@ -34,8 +34,7 @@ static inline MagickPixelInfo *CloneMagickPixelInfo( MagickPixelInfo *clone_pixel; - clone_pixel=(MagickPixelInfo *) AcquireAlignedMemory(1, - sizeof(*clone_pixel)); + clone_pixel=(MagickPixelInfo *) AcquireMemory(sizeof(*clone_pixel)); if (clone_pixel == (MagickPixelInfo *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); *clone_pixel=(*pixel); @@ -88,41 +87,17 @@ static inline MagickBooleanType IsMonochromePixel(const PixelInfo *pixel) return(MagickFalse); } -static inline void SetMagickPixelInfo(const Image *image, - const PixelInfo *color,const IndexPacket *index,MagickPixelInfo *pixel) -{ - pixel->red=(MagickRealType) GetPixelRed(color); - pixel->green=(MagickRealType) GetPixelGreen(color); - pixel->blue=(MagickRealType) GetPixelBlue(color); - pixel->opacity=(MagickRealType) GetPixelOpacity(color); - if ((image->colorspace == CMYKColorspace) && - (index != (const IndexPacket *) NULL)) - pixel->index=(MagickRealType) GetPixelIndex(index); -} - -static inline void SetMagickPixelInfoBias(const Image *image, - MagickPixelInfo *pixel) -{ - /* - Obsoleted by MorphologyApply(). - */ - pixel->red=image->bias; - pixel->green=image->bias; - pixel->blue=image->bias; - pixel->opacity=image->bias; - pixel->index=image->bias; -} - static inline void SetPixelInfo(const Image *image, const MagickPixelInfo *pixel,PixelInfo *color,IndexPacket *index) { SetPixelRed(color,ClampToQuantum(pixel->red)); SetPixelGreen(color,ClampToQuantum(pixel->green)); SetPixelBlue(color,ClampToQuantum(pixel->blue)); - if (image->colorspace == CMYKColorspace) + if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) + SetPixelAlpha(color,ClampToQuantum(pixel->alpha)); + if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) SetPixelBlack(index,ClampToQuantum(pixel->black)); - SetPixelAlpha(color,ClampToQuantum(pixel->alpha)); - if (image->storage_class == PseudoClass) + if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait) SetPixelIndex(index,ClampToQuantum(pixel->index)); } -- 2.50.1