From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 14 Feb 2017 17:10:26 +0000 (-0500)
Subject: Revert patch that did not set update trait on alpha channel
X-Git-Tag: 7.0.4-9~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf5013951703c49fe53aa8d21459920c33e30071;p=imagemagick

Revert patch that did not set update trait on alpha channel
---

diff --git a/ChangeLog b/ChangeLog
index 23662362c..cedf17611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-02-14  7.0.4-9 Cristy  <quetzlzacatenango@image...>
+  * Revert patch that did not set update trait on alpha channel.
+
 2017-02-13  7.0.4-8 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.4-8, GIT revision 19574:7642384:20170213.
 
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 214787323..bd8707d95 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -60,7 +60,7 @@ typedef enum
   RGBChannels = 0x0200,      /* set alpha from grayscale mask in RGB */
   GrayChannels = 0x0400,
   SyncChannels = 0x20000,    /* channels modified as a single unit */
-  DefaultChannels = (AllChannels &~ AlphaChannel)
+  DefaultChannels = AllChannels
 } ChannelType;  /* must correspond to PixelChannel */
 
 typedef enum