From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 8 Dec 2011 21:12:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61f18adcc41fdd05d57e50544cdb9d321bb18953;p=imagemagick

---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index bbd736208..2bc36aace 100644
--- 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 24002cb5b..8d8b78a30 100644
--- 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 fc9ad2171..01825a330 100644
--- 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"/>