From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 7 Jan 2012 00:03:25 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f858f4246861c2941d01b37e7616d1d75493994;p=imagemagick

---

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 6a314cec1..75652f06f 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 #include <MagickCore/colorspace.h>
-#include <MagickCore/constitute.h>
 
 #define MaxPixelChannels  32
 #undef index
@@ -123,6 +122,18 @@ typedef struct _PixelPacket
     black;
 } PixelPacket;
 
+typedef enum
+{
+  UndefinedPixel,
+  CharPixel,
+  DoublePixel,
+  FloatPixel,
+  IntegerPixel,
+  LongPixel,
+  QuantumPixel,
+  ShortPixel
+} StorageType;
+
 typedef struct _CacheView
   CacheView_;
 
diff --git a/coders/cals.c b/coders/cals.c
index 9fadccab6..6ebcb7842 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -49,6 +49,7 @@
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
 #include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/geometry.h"
diff --git a/coders/inline.c b/coders/inline.c
index 0534a8503..56ba3e72d 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -43,6 +43,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/client.h"
+#include "MagickCore/constitute.h"
 #include "MagickCore/display.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"