(no commit message)

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index c842c4aea2b7bc0e52bb6795db2f36bc5dd91ad9..81f61e3c75bf47addcbbac6538fb3f6f1165ae2c 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4533,16 +4533,22 @@ MagickExport void PushPixelChannelMap(Image *image,
 MagickExport void SetPixelChannelMap(Image *image,
   const ChannelType channel_mask)
 {
-#define IsChannelSet(mask,channel) \
-  ((((size_t) (channel) >> (size_t) (i)) & 0x01) != 0)
-
   register ssize_t
     i;
 
-  for (i=0; i < (ssize_t) MaxPixelChannels; i++)
-    SetPixelChannelMapTraits(image,(PixelChannel) i,
-      IsChannelSet(channel_mask,i) ? UpdatePixelTrait : CopyPixelTrait);
+  for (i=0; i < MaxPixelChannels; i++)
+    SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
   image->sync=(channel_mask & SyncChannels) != 0 ? MagickTrue : MagickFalse;
+  if ((channel_mask & RedChannel) != 0)
+    SetPixelRedTraits(image,UpdatePixelTrait);
+  if ((channel_mask & GreenChannel) != 0)
+    SetPixelGreenTraits(image,UpdatePixelTrait);
+  if ((channel_mask & BlueChannel) != 0)
+    SetPixelBlueTraits(image,UpdatePixelTrait);
+  if ((channel_mask & BlackChannel) != 0)
+    SetPixelBlackTraits(image,UpdatePixelTrait);
+  if ((channel_mask & AlphaChannel) != 0)
+    SetPixelAlphaTraits(image,UpdatePixelTrait);
 }
 \f
 /*

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 6f2323eece982c1b888bee1cb428d833ac35433c..4f955e94412123c23976964b60b2ef15b069391b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-07-23"
+#define MagickReleaseDate  "2011-07-24"
 #define MagickChangeDate   "20110721"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)