From: cristy Date: Fri, 11 Jan 2013 12:20:05 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4441 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f697adb7d4caaa9d981fa6b1da731ac8adaaece9;p=imagemagick --- diff --git a/MagickCore/accelerate.h b/MagickCore/accelerate.h index 0338287e8..578cc6682 100644 --- a/MagickCore/accelerate.h +++ b/MagickCore/accelerate.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/morphology.h" extern MagickExport MagickBooleanType AccelerateConvolveImage(const Image *,const KernelInfo *,Image *, diff --git a/MagickCore/attribute.h b/MagickCore/attribute.h index aac4678c7..5986bc9bb 100644 --- a/MagickCore/attribute.h +++ b/MagickCore/attribute.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/image.h" +#include "MagickCore/exception.h" extern MagickExport ImageType GetImageType(const Image *,ExceptionInfo *); diff --git a/MagickCore/color.h b/MagickCore/color.h index b2a489971..1ec1831de 100644 --- a/MagickCore/color.h +++ b/MagickCore/color.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/pixel.h" +#include "MagickCore/exception.h" typedef enum { diff --git a/MagickCore/colormap-private.h b/MagickCore/colormap-private.h index 165183401..474784dbb 100644 --- a/MagickCore/colormap-private.h +++ b/MagickCore/colormap-private.h @@ -22,9 +22,9 @@ extern "C" { #endif -#include -#include -#include +#include "MagickCore/image.h" +#include "MagickCore/color.h" +#include "MagickCore/exception-private.h" static inline Quantum ConstrainColormapIndex(Image *image,const size_t index, ExceptionInfo *exception) diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h index fb5d84afa..0d4116f4b 100644 --- a/MagickCore/colorspace-private.h +++ b/MagickCore/colorspace-private.h @@ -22,10 +22,10 @@ extern "C" { #endif -#include -#include -#include -#include +#include "MagickCore/image.h" +#include "MagickCore/image-private.h" +#include "MagickCore/pixel.h" +#include "MagickCore/pixel-accessor.h" static inline void ConvertRGBToCMYK(PixelInfo *pixel) { diff --git a/MagickCore/constitute.h b/MagickCore/constitute.h index a251d0665..1807f5d13 100644 --- a/MagickCore/constitute.h +++ b/MagickCore/constitute.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/pixel.h" extern MagickExport Image *ConstituteImage(const size_t,const size_t,const char *,const StorageType, diff --git a/MagickCore/decorate.h b/MagickCore/decorate.h index 49b767254..63416f3be 100644 --- a/MagickCore/decorate.h +++ b/MagickCore/decorate.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/image.h" typedef struct _FrameInfo { diff --git a/MagickCore/distribute-cache.h b/MagickCore/distribute-cache.h index 669f46289..32d5bb84e 100644 --- a/MagickCore/distribute-cache.h +++ b/MagickCore/distribute-cache.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/exception.h" extern MagickExport void PixelCacheServer(const size_t,ExceptionInfo *); diff --git a/MagickCore/effect.h b/MagickCore/effect.h index e5cc7d45d..ed68cfe87 100644 --- a/MagickCore/effect.h +++ b/MagickCore/effect.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/morphology.h" typedef enum { diff --git a/MagickCore/gem.h b/MagickCore/gem.h index de0a28a3a..151bc4124 100644 --- a/MagickCore/gem.h +++ b/MagickCore/gem.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/fx.h" +#include "MagickCore/random_.h" extern MagickExport double ExpandAffine(const AffineMatrix *); diff --git a/MagickCore/image.h b/MagickCore/image.h index 1f2d62cc6..8534c4ae6 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/color.h" +#include "MagickCore/pixel.h" #define OpaqueAlpha ((Quantum) QuantumRange) #define TransparentAlpha ((Quantum) 0) diff --git a/MagickCore/layer.h b/MagickCore/layer.h index 83303788c..845a8b2a7 100644 --- a/MagickCore/layer.h +++ b/MagickCore/layer.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/composite.h" typedef enum { diff --git a/MagickCore/monitor-private.h b/MagickCore/monitor-private.h index 1e864cf43..e31270c36 100644 --- a/MagickCore/monitor-private.h +++ b/MagickCore/monitor-private.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/image.h" static inline MagickBooleanType SetImageProgress(const Image *image, const char *tag,const MagickOffsetType offset,const MagickSizeType extent) diff --git a/MagickCore/morphology-private.h b/MagickCore/morphology-private.h index b1f267503..978ac2e75 100644 --- a/MagickCore/morphology-private.h +++ b/MagickCore/morphology-private.h @@ -26,7 +26,7 @@ extern "C" { } #endif -#include +#include "MagickCore/morphology.h" extern MagickPrivate Image *MorphologyApply(const Image *,const MorphologyMethod,const ssize_t, diff --git a/MagickCore/morphology.h b/MagickCore/morphology.h index 541b2d8b6..5d8239f0f 100644 --- a/MagickCore/morphology.h +++ b/MagickCore/morphology.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/geometry.h" typedef enum { diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index e323ed4e9..f54e055df 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -23,12 +23,12 @@ extern "C" { #endif #include -#include -#include -#include -#include -#include -#include +#include "MagickCore/cache.h" +#include "MagickCore/cache-view.h" +#include "MagickCore/color.h" +#include "MagickCore/colorspace.h" +#include "MagickCore/gem.h" +#include "MagickCore/image.h" #undef index diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index 1eedf7ef7..6c4918f66 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/colorspace.h" #define MaxPixelChannels 32 #undef index diff --git a/MagickCore/policy.h b/MagickCore/policy.h index 2d36d46dc..4cef101a4 100644 --- a/MagickCore/policy.h +++ b/MagickCore/policy.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/pixel.h" +#include "MagickCore/exception.h" typedef enum { diff --git a/MagickCore/resample.h b/MagickCore/resample.h index 9eb8cbfeb..5d4171191 100644 --- a/MagickCore/resample.h +++ b/MagickCore/resample.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/cache-view.h" /* WARNING: The order of this table must also match the order of a table diff --git a/MagickCore/signature-private.h b/MagickCore/signature-private.h index 093507973..d2cdd3ae6 100644 --- a/MagickCore/signature-private.h +++ b/MagickCore/signature-private.h @@ -24,7 +24,7 @@ extern "C" { #define MagickSignatureSize 64 -#include +#include "MagickCore/string_.h" typedef struct _SignatureInfo SignatureInfo; diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h index bad3af56c..bd08be8b3 100644 --- a/MagickCore/string-private.h +++ b/MagickCore/string-private.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "MagickCore/locale_.h" static inline double SiPrefixToDoubleInterval(const char *string, const double interval) diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index 90b658083..4b1234d34 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -22,9 +22,9 @@ extern "C" { #endif -#include -#include -#include +#include "MagickCore/cache.h" +#include "MagickCore/resource_.h" +#include "MagickCore/thread_.h" /* Single threaded unless workload justifies the threading overhead. diff --git a/MagickCore/xml-tree-private.h b/MagickCore/xml-tree-private.h index e95876b4f..cb1a1be48 100644 --- a/MagickCore/xml-tree-private.h +++ b/MagickCore/xml-tree-private.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "MagickCore/exception.h" +#include "MagickCore/splay-tree.h" extern MagickPrivate char *CanonicalXMLContent(const char *,const MagickBooleanType);