From f25d0b4a02720878b61960dbca9c9ef9a378b447 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 19 Sep 2011 01:42:30 +0000 Subject: [PATCH] --- MagickCore/pixel-accessor.h | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 5351d8ba0..e555f066a 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -418,17 +418,13 @@ static inline MagickBooleanType IsPixelPacketMonochrome( static inline void SetPacketPixelInfo(const Image *image, const PixelInfo *pixel_info,PixelPacket *packet) { - if ((image->channel_map[RedPixelChannel].traits & UpdatePixelTrait) != 0) - packet->red=ClampToQuantum(pixel_info->red); - if ((image->channel_map[GreenPixelChannel].traits & UpdatePixelTrait) != 0) - packet->green=ClampToQuantum(pixel_info->green); - if ((image->channel_map[BluePixelChannel].traits & UpdatePixelTrait) != 0) - packet->blue=ClampToQuantum(pixel_info->blue); - if ((image->channel_map[BlackPixelChannel].traits & UpdatePixelTrait) != 0) + packet->red=ClampToQuantum(pixel_info->red); + packet->green=ClampToQuantum(pixel_info->green); + packet->blue=ClampToQuantum(pixel_info->blue); + packet->alpha=ClampToQuantum(pixel_info->alpha); + if (image->colorspace == CMYKColorspace) packet->black=ClampToQuantum(pixel_info->black); - if ((image->channel_map[AlphaPixelChannel].traits & CopyPixelTrait) != 0) - packet->alpha=ClampToQuantum(pixel_info->alpha); - if ((image->channel_map[IndexPixelChannel].traits & CopyPixelTrait) != 0) + if (image->storage_class == PseudoClass) packet->index=ClampToQuantum(pixel_info->index); } @@ -558,17 +554,13 @@ static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits) static inline void SetPixelInfo(const Image *image,const Quantum *pixel, PixelInfo *pixel_info) { - if ((image->channel_map[RedPixelChannel].traits & UpdatePixelTrait) != 0) - pixel_info->red=(MagickRealType) GetPixelRed(image,pixel); - if ((image->channel_map[GreenPixelChannel].traits & UpdatePixelTrait) != 0) - pixel_info->green=(MagickRealType) GetPixelGreen(image,pixel); - if ((image->channel_map[BluePixelChannel].traits & UpdatePixelTrait) != 0) - pixel_info->blue=(MagickRealType) GetPixelBlue(image,pixel); - if ((image->channel_map[BlackPixelChannel].traits & UpdatePixelTrait) != 0) + pixel_info->red=(MagickRealType) GetPixelRed(image,pixel); + pixel_info->green=(MagickRealType) GetPixelGreen(image,pixel); + pixel_info->blue=(MagickRealType) GetPixelBlue(image,pixel); + pixel_info->alpha=(MagickRealType) GetPixelAlpha(image,pixel); + if (image->colorspace == CMYKColorspace) pixel_info->black=(MagickRealType) GetPixelBlack(image,pixel); - if ((image->channel_map[AlphaPixelChannel].traits & CopyPixelTrait) != 0) - pixel_info->alpha=(MagickRealType) GetPixelAlpha(image,pixel); - if ((image->channel_map[IndexPixelChannel].traits & CopyPixelTrait) != 0) + if (image->storage_class == PseudoClass) pixel_info->index=(MagickRealType) GetPixelIndex(image,pixel); } @@ -645,8 +637,7 @@ static inline void SetPixelPixelInfo(const Image *image, SetPixelRed(image,ClampToQuantum(pixel_info->red),packet); SetPixelGreen(image,ClampToQuantum(pixel_info->green),packet); SetPixelBlue(image,ClampToQuantum(pixel_info->blue),packet); - if (image->matte != MagickFalse) - SetPixelAlpha(image,ClampToQuantum(pixel_info->alpha),packet); + SetPixelAlpha(image,ClampToQuantum(pixel_info->alpha),packet); if (image->colorspace == CMYKColorspace) SetPixelBlack(image,ClampToQuantum(pixel_info->black),packet); } -- 2.40.0