From ed7f7792154d9cbd913a62bccc080624fb1e184f Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 24 Aug 2011 17:04:51 +0000 Subject: [PATCH] --- MagickCore/magick-type.h | 4 ++-- MagickCore/pixel.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index 6e375ab62..20e73689a 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -148,7 +148,7 @@ typedef enum AlphaChannel = 0x0008, OpacityChannel = 0x0008, BlackChannel = 0x0010, - IndexChannel = 0x0020, + IndexChannel = 0x0010, CompositeChannels = 0x002F, AllChannels = ~0L, /* @@ -158,7 +158,7 @@ typedef enum RGBChannels = 0x0080, /* set alpha from grayscale mask in RGB */ GrayChannels = 0x0080, SyncChannels = 0x0100, /* channels should be modified equally */ - DefaultChannels = ((AllChannels | SyncChannels) &~ AlphaChannel &~ IndexChannel) + DefaultChannels = ((AllChannels | SyncChannels) &~ (AlphaChannel || IndexChannel)) } ChannelType; typedef enum diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 057f5ce21..b5c226256 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -3607,7 +3607,7 @@ MagickExport void InitializePixelChannelMap(Image *image) image->number_channels+=image->number_meta_channels; for ( ; i < (ssize_t) image->number_channels; i++) SetPixelChannelMapTraits(image,(PixelChannel) i,CopyPixelTrait); -// SetPixelChannelMap(image,image->channel_mask); + SetPixelChannelMap(image,image->channel_mask); } /* -- 2.50.1