Only in old: AUTHORS.txt Only in old: ChangeLog Only in old: ImageMagick.spec.in Only in old: Install-mac.txt Only in old: Install-unix.txt Only in old: Install-vms.txt Only in old: Install-windows.txt Only in old: LICENSE Only in old: Magick++ Only in old: Magickshr.opt Only in old: Make.com Only in old: Makefile.am Only in old: Makefile.in Only in old: NEWS.txt Only in old: NOTICE Only in old: PerlMagick Only in old: Platforms.txt Only in old: QuickStart.txt Only in old: README.txt Only in old: aclocal.m4 Only in old: check-headers.c Only in old: coders Only in old: config Only in old: configure Only in old: configure.ac Only in old: filters Only in old: images Only in old: index.html Only in old: ltdl Only in old: m4 Only in old/magick: ImageMagick.h Only in old/magick: ImageMagick.pc.in Only in old/magick: Magick-config.1 Only in old/magick: Magick-config.in Only in old/magick: MagickCore-config.1 Only in old/magick: MagickCore-config.in Index: ImageMagick-6.6.9-9/magick/MagickCore.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/MagickCore.h +++ ImageMagick-6.6.9-9/magick/MagickCore.h @@ -26,7 +26,7 @@ extern "C" { #if !defined(_MAGICKCORE_CONFIG_H) # define _MAGICKCORE_CONFIG_H # if !defined(vms) && !defined(macintosh) -# include "magick/magick-config.h" +# include "magick-config.h" # else # include "magick-config.h" # endif @@ -121,88 +121,88 @@ extern "C" { #if defined(MAGICKCORE_NAMESPACE_PREFIX) # include "magick/methods.h" #endif -#include "magick/magick-type.h" -#include "magick/accelerate.h" -#include "magick/animate.h" -#include "magick/annotate.h" -#include "magick/artifact.h" -#include "magick/attribute.h" -#include "magick/blob.h" -#include "magick/cache.h" -#include "magick/cache-view.h" -#include "magick/cipher.h" -#include "magick/client.h" -#include "magick/coder.h" -#include "magick/color.h" -#include "magick/colorspace.h" -#include "magick/colormap.h" -#include "magick/compare.h" -#include "magick/composite.h" -#include "magick/compress.h" -#include "magick/configure.h" -#include "magick/constitute.h" -#include "magick/decorate.h" -#include "magick/delegate.h" -#include "magick/deprecate.h" -#include "magick/display.h" -#include "magick/distort.h" -#include "magick/draw.h" -#include "magick/effect.h" -#include "magick/enhance.h" -#include "magick/exception.h" -#include "magick/feature.h" -#include "magick/fourier.h" -#include "magick/fx.h" -#include "magick/gem.h" -#include "magick/geometry.h" -#include "magick/hashmap.h" -#include "magick/histogram.h" -#include "magick/identify.h" -#include "magick/image.h" -#include "magick/image-view.h" -#include "magick/layer.h" -#include "magick/list.h" -#include "magick/locale_.h" -#include "magick/log.h" -#include "magick/magic.h" -#include "magick/magick.h" -#include "magick/matrix.h" -#include "magick/memory_.h" -#include "magick/module.h" -#include "magick/mime.h" -#include "magick/monitor.h" -#include "magick/montage.h" -#include "magick/morphology.h" -#include "magick/option.h" -#include "magick/paint.h" -#include "magick/pixel.h" -#include "magick/policy.h" -#include "magick/prepress.h" -#include "magick/profile.h" -#include "magick/property.h" -#include "magick/quantize.h" -#include "magick/quantum.h" -#include "magick/registry.h" -#include "magick/random_.h" -#include "magick/resample.h" -#include "magick/resize.h" -#include "magick/resource_.h" -#include "magick/segment.h" -#include "magick/shear.h" -#include "magick/signature.h" -#include "magick/splay-tree.h" -#include "magick/stream.h" -#include "magick/statistic.h" -#include "magick/string_.h" -#include "magick/timer.h" -#include "magick/token.h" -#include "magick/transform.h" -#include "magick/threshold.h" -#include "magick/type.h" -#include "magick/utility.h" -#include "magick/version.h" -#include "magick/xml-tree.h" -#include "magick/xwindow.h" +#include "magick-type.h" +#include "accelerate.h" +#include "animate.h" +#include "annotate.h" +#include "artifact.h" +#include "attribute.h" +#include "blob.h" +#include "cache.h" +#include "cache-view.h" +#include "cipher.h" +#include "client.h" +#include "coder.h" +#include "color.h" +#include "colorspace.h" +#include "colormap.h" +#include "compare.h" +#include "composite.h" +#include "compress.h" +#include "configure.h" +#include "constitute.h" +#include "decorate.h" +#include "delegate.h" +#include "deprecate.h" +#include "display.h" +#include "distort.h" +#include "draw.h" +#include "effect.h" +#include "enhance.h" +#include "exception.h" +#include "feature.h" +#include "fourier.h" +#include "fx.h" +#include "gem.h" +#include "geometry.h" +#include "hashmap.h" +#include "histogram.h" +#include "identify.h" +#include "image.h" +#include "image-view.h" +#include "layer.h" +#include "list.h" +#include "locale_.h" +#include "log.h" +#include "magic.h" +#include "magick.h" +#include "matrix.h" +#include "memory_.h" +#include "module.h" +#include "mime.h" +#include "monitor.h" +#include "montage.h" +#include "morphology.h" +#include "option.h" +#include "paint.h" +#include "pixel.h" +#include "policy.h" +#include "prepress.h" +#include "profile.h" +#include "property.h" +#include "quantize.h" +#include "quantum.h" +#include "registry.h" +#include "random_.h" +#include "resample.h" +#include "resize.h" +#include "resource_.h" +#include "segment.h" +#include "shear.h" +#include "signature.h" +#include "splay-tree.h" +#include "stream.h" +#include "statistic.h" +#include "string_.h" +#include "timer.h" +#include "token.h" +#include "transform.h" +#include "threshold.h" +#include "type.h" +#include "utility.h" +#include "version.h" +#include "xml-tree.h" +#include "xwindow.h" #if defined(__cplusplus) || defined(c_plusplus) } Index: ImageMagick-6.6.9-9/magick/accelerate.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/accelerate.h +++ ImageMagick-6.6.9-9/magick/accelerate.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "morphology.h" extern MagickExport MagickBooleanType AccelerateConvolveImage(const Image *,const KernelInfo *,Image *, Index: ImageMagick-6.6.9-9/magick/annotate.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/annotate.h +++ ImageMagick-6.6.9-9/magick/annotate.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/draw.h" +#include "draw.h" extern MagickExport MagickBooleanType AnnotateComponentGenesis(void), Index: ImageMagick-6.6.9-9/magick/attribute.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/attribute.h +++ ImageMagick-6.6.9-9/magick/attribute.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "image.h" +#include "exception.h" extern MagickExport ImageType GetImageType(const Image *,ExceptionInfo *); Index: ImageMagick-6.6.9-9/magick/blob.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/blob.h +++ ImageMagick-6.6.9-9/magick/blob.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include "magick/image.h" -#include "magick/stream.h" +#include "image.h" +#include "stream.h" #define MagickMaxBufferExtent (32*8192) Index: ImageMagick-6.6.9-9/magick/cache-view.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/cache-view.h +++ ImageMagick-6.6.9-9/magick/cache-view.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/pixel.h" +#include "pixel.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/cache.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/cache.h +++ ImageMagick-6.6.9-9/magick/cache.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/blob.h" +#include "blob.h" extern MagickExport const IndexPacket *GetVirtualIndexQueue(const Image *); Index: ImageMagick-6.6.9-9/magick/color.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/color.h +++ ImageMagick-6.6.9-9/magick/color.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "pixel.h" +#include "exception.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/compare.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/compare.h +++ ImageMagick-6.6.9-9/magick/compare.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/image.h" +#include "image.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/configure.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/configure.h +++ ImageMagick-6.6.9-9/magick/configure.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/hashmap.h" +#include "hashmap.h" typedef struct _ConfigureInfo { Index: ImageMagick-6.6.9-9/magick/deprecate.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/deprecate.h +++ ImageMagick-6.6.9-9/magick/deprecate.h @@ -25,16 +25,16 @@ extern "C" { #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) #include -#include "magick/blob.h" -#include "magick/cache-view.h" -#include "magick/draw.h" -#include "magick/constitute.h" -#include "magick/magick-config.h" -#include "magick/pixel.h" -#include "magick/quantize.h" -#include "magick/quantum.h" -#include "magick/registry.h" -#include "magick/semaphore.h" +#include "blob.h" +#include "cache-view.h" +#include "draw.h" +#include "constitute.h" +#include "magick-config.h" +#include "pixel.h" +#include "quantize.h" +#include "quantum.h" +#include "registry.h" +#include "semaphore.h" #if !defined(magick_attribute) # if !defined(__GNUC__) Index: ImageMagick-6.6.9-9/magick/draw.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/draw.h +++ ImageMagick-6.6.9-9/magick/draw.h @@ -22,10 +22,10 @@ extern "C" { #endif -#include "magick/geometry.h" -#include "magick/image.h" -#include "magick/pixel.h" -#include "magick/type.h" +#include "geometry.h" +#include "image.h" +#include "pixel.h" +#include "type.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/effect.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/effect.h +++ ImageMagick-6.6.9-9/magick/effect.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "morphology.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/exception.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/exception.h +++ ImageMagick-6.6.9-9/magick/exception.h @@ -23,7 +23,7 @@ extern "C" { #endif #include -#include "magick/semaphore.h" +#include "semaphore.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/fx.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/fx.h +++ ImageMagick-6.6.9-9/magick/fx.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/draw.h" +#include "draw.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/gem.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/gem.h +++ ImageMagick-6.6.9-9/magick/gem.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "fx.h" +#include "random_.h" extern MagickExport double ExpandAffine(const AffineMatrix *), Index: ImageMagick-6.6.9-9/magick/image.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/image.h +++ ImageMagick-6.6.9-9/magick/image.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "color.h" #define OpaqueOpacity ((Quantum) 0UL) #define TransparentOpacity ((Quantum) QuantumRange) @@ -125,24 +125,24 @@ typedef struct _ChromaticityInfo white_point; } ChromaticityInfo; -#include "magick/blob.h" -#include "magick/colorspace.h" -#include "magick/cache-view.h" -#include "magick/color.h" -#include "magick/composite.h" -#include "magick/compress.h" -#include "magick/effect.h" -#include "magick/geometry.h" -#include "magick/layer.h" -#include "magick/monitor.h" -#include "magick/pixel.h" -#include "magick/profile.h" -#include "magick/quantum.h" -#include "magick/resample.h" -#include "magick/resize.h" -#include "magick/semaphore.h" -#include "magick/stream.h" -#include "magick/timer.h" +#include "blob.h" +#include "colorspace.h" +#include "cache-view.h" +#include "color.h" +#include "composite.h" +#include "compress.h" +#include "effect.h" +#include "geometry.h" +#include "layer.h" +#include "monitor.h" +#include "pixel.h" +#include "profile.h" +#include "quantum.h" +#include "resample.h" +#include "resize.h" +#include "semaphore.h" +#include "stream.h" +#include "timer.h" struct _Image { Index: ImageMagick-6.6.9-9/magick/locale_.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/locale_.h +++ ImageMagick-6.6.9-9/magick/locale_.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/hashmap.h" +#include "hashmap.h" typedef struct _LocaleInfo { Index: ImageMagick-6.6.9-9/magick/log.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/log.h +++ ImageMagick-6.6.9-9/magick/log.h @@ -23,7 +23,7 @@ extern "C" { #endif #include -#include "magick/exception.h" +#include "exception.h" #if !defined(GetMagickModule) # define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__ Index: ImageMagick-6.6.9-9/magick/magick-type.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/magick-type.h +++ ImageMagick-6.6.9-9/magick/magick-type.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/magick-config.h" +#include "magick-config.h" #if !defined(MAGICKCORE_QUANTUM_DEPTH) #define MAGICKCORE_QUANTUM_DEPTH 16 Index: ImageMagick-6.6.9-9/magick/module.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/module.h +++ ImageMagick-6.6.9-9/magick/module.h @@ -23,7 +23,7 @@ extern "C" { #endif #include -#include "magick/version.h" +#include "version.h" #define MagickImageCoderSignature ((size_t) \ (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH)) Index: ImageMagick-6.6.9-9/magick/morphology.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/morphology.h +++ ImageMagick-6.6.9-9/magick/morphology.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "geometry.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/paint.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/paint.h +++ ImageMagick-6.6.9-9/magick/paint.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include "magick/color.h" -#include "magick/draw.h" +#include "color.h" +#include "draw.h" extern MagickExport Image *OilPaintImage(const Image *,const double,ExceptionInfo *); Index: ImageMagick-6.6.9-9/magick/pixel.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/pixel.h +++ ImageMagick-6.6.9-9/magick/pixel.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "colorspace.h" +#include "constitute.h" #define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red) #define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green) Index: ImageMagick-6.6.9-9/magick/policy.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/policy.h +++ ImageMagick-6.6.9-9/magick/policy.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "pixel.h" +#include "exception.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/profile.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/profile.h +++ ImageMagick-6.6.9-9/magick/profile.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/string_.h" +#include "string_.h" typedef struct _ProfileInfo { Index: ImageMagick-6.6.9-9/magick/quantize.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/quantize.h +++ ImageMagick-6.6.9-9/magick/quantize.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/colorspace.h" +#include "colorspace.h" typedef enum { Index: ImageMagick-6.6.9-9/magick/quantum.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/quantum.h +++ ImageMagick-6.6.9-9/magick/quantum.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/semaphore.h" +#include "semaphore.h" #define RoundToQuantum(quantum) ClampToQuantum(quantum) Index: ImageMagick-6.6.9-9/magick/random_.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/random_.h +++ ImageMagick-6.6.9-9/magick/random_.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "magick/string_.h" +#include "string_.h" /* Typedef declarations. Index: ImageMagick-6.6.9-9/magick/resample.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/resample.h +++ ImageMagick-6.6.9-9/magick/resample.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include "cache-view.h" /* WARNING: The order of this table must also match the order of a table Index: ImageMagick-6.6.9-9/magick/string_.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/string_.h +++ ImageMagick-6.6.9-9/magick/string_.h @@ -24,7 +24,7 @@ extern "C" { #include #include -#include "magick/exception.h" +#include "exception.h" typedef struct _StringInfo { Index: ImageMagick-6.6.9-9/magick/xml-tree.h =================================================================== --- ImageMagick-6.6.9-9.orig/magick/xml-tree.h +++ ImageMagick-6.6.9-9/magick/xml-tree.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include "exception.h" +#include "splay-tree.h" typedef struct _XMLTreeInfo XMLTreeInfo; Index: ImageMagick-6.6.9-9/wand/MagickWand.h =================================================================== --- ImageMagick-6.6.9-9.orig/wand/MagickWand.h +++ ImageMagick-6.6.9-9/wand/MagickWand.h @@ -26,7 +26,7 @@ extern "C" { #if !defined(_MAGICKWAND_CONFIG_H) # define _MAGICKWAND_CONFIG_H # if !defined(vms) && !defined(macintosh) -# include "magick/magick-config.h" +# include "../magick/magick-config.h" # else # include "magick-config.h" # endif @@ -121,25 +121,25 @@ extern "C" { typedef struct _MagickWand MagickWand; -#include "magick/MagickCore.h" -#include "wand/animate.h" -#include "wand/compare.h" -#include "wand/composite.h" -#include "wand/conjure.h" -#include "wand/convert.h" -#include "wand/deprecate.h" -#include "wand/display.h" -#include "wand/drawing-wand.h" -#include "wand/identify.h" -#include "wand/import.h" -#include "wand/magick-property.h" -#include "wand/magick-image.h" -#include "wand/mogrify.h" -#include "wand/montage.h" -#include "wand/pixel-iterator.h" -#include "wand/pixel-wand.h" -#include "wand/stream.h" -#include "wand/wand-view.h" +#include "../magick/MagickCore.h" +#include "animate.h" +#include "compare.h" +#include "composite.h" +#include "conjure.h" +#include "convert.h" +#include "deprecate.h" +#include "display.h" +#include "drawing-wand.h" +#include "identify.h" +#include "import.h" +#include "magick-property.h" +#include "magick-image.h" +#include "mogrify.h" +#include "montage.h" +#include "pixel-iterator.h" +#include "pixel-wand.h" +#include "stream.h" +#include "wand-view.h" extern WandExport char *MagickGetException(const MagickWand *,ExceptionType *); Index: ImageMagick-6.6.9-9/wand/deprecate.h =================================================================== --- ImageMagick-6.6.9-9.orig/wand/deprecate.h +++ ImageMagick-6.6.9-9/wand/deprecate.h @@ -24,10 +24,10 @@ extern "C" { #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) -#include "wand/drawing-wand.h" -#include "wand/magick-wand.h" -#include "wand/pixel-iterator.h" -#include "wand/pixel-wand.h" +#include "drawing-wand.h" +#include "magick-wand.h" +#include "pixel-iterator.h" +#include "pixel-wand.h" typedef struct _DrawingWand *DrawContext; Index: ImageMagick-6.6.9-9/wand/drawing-wand.h =================================================================== --- ImageMagick-6.6.9-9.orig/wand/drawing-wand.h +++ ImageMagick-6.6.9-9/wand/drawing-wand.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "wand/pixel-wand.h" +#include "pixel-wand.h" typedef struct _DrawingWand DrawingWand; Index: ImageMagick-6.6.9-9/wand/magick-wand.h =================================================================== --- ImageMagick-6.6.9-9.orig/wand/magick-wand.h +++ ImageMagick-6.6.9-9/wand/magick-wand.h @@ -19,6 +19,6 @@ #ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H #define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H -#include "wand/MagickWand.h" +#include "MagickWand.h" #endif Index: ImageMagick-6.6.9-9/wand/pixel-iterator.h =================================================================== --- ImageMagick-6.6.9-9.orig/wand/pixel-iterator.h +++ ImageMagick-6.6.9-9/wand/pixel-iterator.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include "wand/magick-wand.h" -#include "wand/pixel-wand.h" +#include "magick-wand.h" +#include "pixel-wand.h" typedef struct _PixelIterator PixelIterator;