(no commit message)

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 6e375ab620099a2173c0127c02af5bcc14e44987..20e73689a161732a647fe27e32fdd22c91e1047a 100644 (file)
--- 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 057f5ce21d99abeb25bc525be8fae20f5a952971..b5c2262569a32d66f36f35265e80695561682aa9 100644 (file)
--- 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);
 }
 \f
 /*