(no commit message)

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 6a314cec172b111053da98456470d82ac2ae8fee..75652f06f67c16169f78051f621fa8af99b134b7 100644 (file)
--- 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 9fadccab6109d3d886a9fd6fa09459f27e0c8240..6ebcb7842a14749077cb9455a38023bd8a219b02 100644 (file)
--- 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 0534a85033bc47f62ce3f89a2c4682eeef0b22f5..56ba3e72db24f428584ce1d3779a0156c962ce7e 100644 (file)
--- 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"