From 49a3ee9533d1768eef137d11018bb6c335796a29 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 11 Jul 2011 01:51:40 +0000 Subject: [PATCH] --- MagickCore/pixel.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 881ca1a4b..bc1784a22 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4579,27 +4579,29 @@ MagickExport void StandardPixelComponentMap(Image *image) { image->pixel_components=4; SetPixelComponentMapComponent(image,RedPixelComponent,RedPixelComponent); - SetPixelComponentMapTraits(image,RedPixelComponent,ActivePixelTrait | - BlendPixelTrait); + SetPixelComponentMapTraits(image,RedPixelComponent,(PixelTrait) + (ActivePixelTrait | BlendPixelTrait)); SetPixelComponentMapComponent(image,GreenPixelComponent,GreenPixelComponent); - SetPixelComponentMapTraits(image,GreenPixelComponent,ActivePixelTrait | - BlendPixelTrait); + SetPixelComponentMapTraits(image,GreenPixelComponent,(PixelTrait) + (ActivePixelTrait | BlendPixelTrait)); SetPixelComponentMapComponent(image,BluePixelComponent,BluePixelComponent); - SetPixelComponentMapTraits(image,BluePixelComponent,ActivePixelTrait | - BlendPixelTrait); + SetPixelComponentMapTraits(image,BluePixelComponent,(PixelTrait) + (ActivePixelTrait | BlendPixelTrait)); SetPixelComponentMapComponent(image,AlphaPixelComponent,AlphaPixelComponent); SetPixelComponentMapTraits(image,AlphaPixelComponent,ActivePixelTrait); if (image->colorspace == CMYKColorspace) { image->pixel_components++; - SetPixelComponentMapComponent(image,BlackPixelComponent,BlackPixelComponent); - SetPixelComponentMapTraits(image,BlackPixelComponent,ActivePixelTrait | - BlendPixelTrait); + SetPixelComponentMapComponent(image,BlackPixelComponent, + BlackPixelComponent); + SetPixelComponentMapTraits(image,BlackPixelComponent,(PixelTrait) + (ActivePixelTrait | BlendPixelTrait)); } if (image->storage_class == PseudoClass) { image->pixel_components++; - SetPixelComponentMapComponent(image,IndexPixelComponent,IndexPixelComponent); + SetPixelComponentMapComponent(image,IndexPixelComponent, + IndexPixelComponent); SetPixelComponentMapTraits(image,IndexPixelComponent,UndefinedPixelTrait); } } -- 2.49.0