]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 28 Aug 2012 11:25:09 +0000 (11:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 28 Aug 2012 11:25:09 +0000 (11:25 +0000)
MagickCore/image.h

index 058645fe78ab04322e2e1f1a6dd0ebcde182fff8..2bb26f4c5adde0f32e30b5d2df40e1070d92ab5d 100644 (file)
@@ -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,