Revert patch that did not set update trait on alpha channel

diff --git a/ChangeLog b/ChangeLog
index 23662362c56c5a661707c514c3d3b856e7410506..cedf176114c7b04a4e53e2a97ad0d012bfc3e210 100644 (file)
--- 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 21478732303819095d3de23dc517468415fc281f..bd8707d951bc881ef1f9395d05772f1405169d92 100644 (file)
--- 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