(no commit message)

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index bbd736208b4d8f9b58f6cfe11f0959e60beab448..2bc36aace246aa267c6343ccef508012ca70ffbe 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -3662,7 +3662,7 @@ MagickExport void InitializePixelChannelMap(Image *image)
     sizeof(*image->channel_map));
   trait=UpdatePixelTrait;
   if (image->matte != MagickFalse)
-    trait|=BlendPixelTrait;
+    trait=(PixelTrait) (trait | BlendPixelTrait);
   n=0;
   SetPixelChannelMap(image,RedPixelChannel,trait,n++);
   SetPixelChannelMap(image,GreenPixelChannel,trait,n++);
@@ -3683,7 +3683,7 @@ if (0)
     SetPixelChannelMap(image,IndexPixelChannel,CopyPixelTrait,n++);
   assert((n+image->number_meta_channels) < MaxPixelChannels);
   for (i=0; i < (ssize_t) image->number_meta_channels; i++)
-    SetPixelChannelMap(image,(PixelChannel) MetaPixelChannel+i,CopyPixelTrait,
+    SetPixelChannelMap(image,(PixelChannel) (MetaPixelChannel+i),CopyPixelTrait,
       n++);
   image->number_channels=n;
   if (image->debug != MagickFalse)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 24002cb5bb40ebbaa64f968b2f32822b87d7915d..8d8b78a30a124b6408f2c5d60e97ee4e3353eba9 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-12-07"
+#define MagickReleaseDate  "2011-12-08"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/configure.xml b/config/configure.xml
index fc9ad2171e2edf1bd2182e4b0a7f3d260b923388..01825a330748862150a09a31aded38806408aa28 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="6141" />
-  <configure name="RELEASE_DATE" value="2011-12-07"/>
+  <configure name="RELEASE_DATE" value="2011-12-08"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>