From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 28 Aug 2012 11:25:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5049
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2485594fef8dd982c178becf7c36526dc9ddb8b4;p=imagemagick

---

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 058645fe7..2bb26f4c5 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -23,6 +23,7 @@ extern "C" {
 #endif
 
 #include <MagickCore/color.h>
+#include <MagickCore/pixel.h>
 
 #define OpaqueAlpha  ((Quantum) QuantumRange)
 #define TransparentAlpha  ((Quantum) 0)
@@ -42,13 +43,6 @@ typedef enum
   TransparentAlphaChannel
 } AlphaChannelType;
 
-typedef enum
-{
-  UndefinedAlpha,
-  InactiveAlpha,
-  ActiveAlpha
-} AlphaChannelState;
-
 typedef enum
 {
   UndefinedType,
@@ -280,8 +274,8 @@ struct _Image
   MagickBooleanType
     mask;
 
-  AlphaChannelState
-    alpha;
+  PixelTrait
+    alpha_traits;
 
   size_t
     number_channels,