From 6398ec777e91813b64767e25358b7062a7de56cb Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 28 Nov 2013 02:00:27 +0000 Subject: [PATCH] --- MagickCore/MagickCore.h | 1 + MagickCore/animate-private.h | 6 ++-- MagickCore/annotate.h | 4 +-- MagickCore/attribute.h | 6 ++-- MagickCore/blob-private.h | 4 +-- MagickCore/blob.h | 6 ++-- MagickCore/cache-private.h | 9 +++--- MagickCore/cache-view.h | 4 +-- MagickCore/cache.h | 4 +-- MagickCore/channel.c | 40 +++++++++++++++++++++++++++ MagickCore/channel.h | 4 +-- MagickCore/color-private.h | 4 +-- MagickCore/color.h | 6 ++-- MagickCore/colormap-private.h | 8 +++--- MagickCore/colorspace-private.h | 8 +++--- MagickCore/compare.h | 4 +-- MagickCore/composite-private.h | 14 +++++----- MagickCore/configure.h | 4 +-- MagickCore/constitute.h | 4 +-- MagickCore/decorate.h | 4 +-- MagickCore/delegate-private.h | 8 +++--- MagickCore/display-private.h | 6 ++-- MagickCore/distribute-cache-private.h | 6 ++-- MagickCore/distribute-cache.h | 4 +-- MagickCore/draw-private.h | 8 +++--- MagickCore/draw.h | 8 +++--- MagickCore/effect.h | 4 +-- MagickCore/enhance.h | 4 +-- MagickCore/exception-private.h | 8 +++--- MagickCore/exception.h | 5 ++-- MagickCore/fx.h | 4 +-- MagickCore/gem-private.h | 4 +-- MagickCore/gem.h | 6 ++-- MagickCore/image.h | 6 ++-- MagickCore/layer.h | 4 +-- MagickCore/locale_.h | 4 +-- MagickCore/log-private.h | 5 ++-- MagickCore/log.h | 5 ++-- MagickCore/mac.h | 8 +++--- MagickCore/magick-type.h | 4 +-- MagickCore/module.h | 5 ++-- MagickCore/monitor-private.h | 4 +-- MagickCore/morphology-private.h | 12 ++++---- MagickCore/morphology.h | 4 +-- MagickCore/nt-base-private.h | 10 +++---- MagickCore/nt-base.h | 6 ++-- MagickCore/nt-feature.h | 8 +++--- MagickCore/opencl-private.h | 25 ++++++++--------- MagickCore/paint.h | 6 ++-- MagickCore/pixel-accessor.h | 9 +++--- MagickCore/pixel.h | 4 +-- MagickCore/policy.h | 6 ++-- MagickCore/profile-private.h | 4 +-- MagickCore/profile.h | 4 +-- MagickCore/quantize.h | 4 +-- MagickCore/quantum-private.h | 4 +-- MagickCore/quantum.h | 6 ++-- MagickCore/random-private.h | 4 +-- MagickCore/random_.h | 4 +-- MagickCore/resample-private.h | 4 +-- MagickCore/resample.h | 4 +-- MagickCore/signature-private.h | 4 +-- MagickCore/string-private.h | 4 +-- MagickCore/string_.h | 4 +-- MagickCore/thread-private.h | 8 +++--- MagickCore/utility-private.h | 8 +++--- MagickCore/version-private.h | 4 +-- MagickCore/version.c | 8 ++++++ MagickCore/widget-private.h | 5 ++-- MagickCore/xml-tree-private.h | 6 ++-- MagickCore/xwindow-private.h | 8 +++--- MagickWand/MagickWand.h | 1 + MagickWand/convert.c | 7 ++--- MagickWand/drawing-wand.h | 4 +-- MagickWand/mogrify.c | 6 ++-- MagickWand/operation.c | 4 +-- MagickWand/pixel-iterator.h | 6 ++-- coders/dcm.c | 2 +- coders/dds.c | 24 ++++++++-------- 79 files changed, 274 insertions(+), 231 deletions(-) diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index b1eef0234..6670b8f3a 100644 --- a/MagickCore/MagickCore.h +++ b/MagickCore/MagickCore.h @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #if defined(WIN32) || defined(WIN64) # define MAGICKCORE_WINDOWS_SUPPORT diff --git a/MagickCore/animate-private.h b/MagickCore/animate-private.h index c295c5de6..01e535778 100644 --- a/MagickCore/animate-private.h +++ b/MagickCore/animate-private.h @@ -18,13 +18,15 @@ #ifndef _MAGICKCORE_ANIMATE_PRIVATE_H #define _MAGICKCORE_ANIMATE_PRIVATE_H +#if defined(MAGICKCORE_X11_DELEGATE) +#include "MagickCore/xwindow-private.h" +#endif + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif #if defined(MAGICKCORE_X11_DELEGATE) -#include "MagickCore/xwindow-private.h" - extern MagickExport Image *XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *, ExceptionInfo *); diff --git a/MagickCore/annotate.h b/MagickCore/annotate.h index 8a7cde531..e42d68999 100644 --- a/MagickCore/annotate.h +++ b/MagickCore/annotate.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_ANNOTATE_H #define _MAGICKCORE_ANNOTATE_H +#include "MagickCore/draw.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/draw.h" - extern MagickExport MagickBooleanType AnnotateImage(Image *,const DrawInfo *,ExceptionInfo *), GetMultilineTypeMetrics(Image *,const DrawInfo *,TypeMetric *, diff --git a/MagickCore/attribute.h b/MagickCore/attribute.h index 27916c92f..ffbe4468e 100644 --- a/MagickCore/attribute.h +++ b/MagickCore/attribute.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_ATTRIBUTE_H #define _MAGICKCORE_ATTRIBUTE_H +#include "MagickCore/image.h" +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" -#include "MagickCore/exception.h" - extern MagickExport ImageType GetImageType(const Image *,ExceptionInfo *); diff --git a/MagickCore/blob-private.h b/MagickCore/blob-private.h index 4000fdc82..317463748 100644 --- a/MagickCore/blob-private.h +++ b/MagickCore/blob-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_BLOB_PRIVATE_H #define _MAGICKCORE_BLOB_PRIVATE_H +#include "MagickCore/nt-feature.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/nt-feature.h" - #define MagickMinBlobExtent 32767L #if defined(MAGICKCORE_HAVE_FSEEKO) # define fseek fseeko diff --git a/MagickCore/blob.h b/MagickCore/blob.h index 6304d4f26..03c06cdd2 100644 --- a/MagickCore/blob.h +++ b/MagickCore/blob.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_BLOB_H #define _MAGICKCORE_BLOB_H +#include "MagickCore/image.h" +#include "MagickCore/stream.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" -#include "MagickCore/stream.h" - #define MagickMaxBufferExtent (32*8192-2) typedef enum diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h index 3be96a975..e27142aab 100644 --- a/MagickCore/cache-private.h +++ b/MagickCore/cache-private.h @@ -18,11 +18,6 @@ #ifndef _MAGICKCORE_CACHE_PRIVATE_H #define _MAGICKCORE_CACHE_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - -#include #include "MagickCore/cache.h" #include "MagickCore/distribute-cache.h" #include "MagickCore/pixel.h" @@ -30,6 +25,10 @@ extern "C" { #include "MagickCore/thread-private.h" #include "MagickCore/semaphore.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + typedef void *Cache; diff --git a/MagickCore/cache-view.h b/MagickCore/cache-view.h index b943f87a6..0e74969d0 100644 --- a/MagickCore/cache-view.h +++ b/MagickCore/cache-view.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_CACHE_VIEW_H #define _MAGICKCORE_CACHE_VIEW_H +#include "MagickCore/pixel.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel.h" - typedef enum { UndefinedVirtualPixelMethod, diff --git a/MagickCore/cache.h b/MagickCore/cache.h index 87b0460fb..e606e6db9 100644 --- a/MagickCore/cache.h +++ b/MagickCore/cache.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_CACHE_H #define _MAGICKCORE_CACHE_H +#include "MagickCore/blob.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/blob.h" - typedef enum { UndefinedCache, diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 440806918..2430bf146 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -197,6 +197,10 @@ static MagickBooleanType ChannelImage(Image *destination_image, return(status); } +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport Image *ChannelFxImage(const Image *image,const char *expression, ExceptionInfo *exception) { @@ -441,6 +445,10 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, } return(GetFirstImageInList(destination_image)); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -472,6 +480,10 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, % o exception: return any errors or warnings in this structure. % */ +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport Image *CombineImages(const Image *image, const ColorspaceType colorspace,ExceptionInfo *exception) { @@ -594,6 +606,10 @@ MagickExport Image *CombineImages(const Image *image, combine_image=DestroyImage(combine_image); return(combine_image); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -656,6 +672,10 @@ MagickExport MagickBooleanType GetImageAlphaChannel(const Image *image) % o exception: return any errors or warnings in this structure. % */ +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport Image *SeparateImage(const Image *image, const ChannelType channel_type,ExceptionInfo *exception) { @@ -776,6 +796,10 @@ MagickExport Image *SeparateImage(const Image *image, separate_image=DestroyImage(separate_image); return(separate_image); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -802,6 +826,10 @@ MagickExport Image *SeparateImage(const Image *image, % o exception: return any errors or warnings in this structure. % */ +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception) { Image @@ -831,6 +859,10 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception) images=SeparateImage(image,UndefinedChannel,exception); return(images); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -926,6 +958,10 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p, } } +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, const AlphaChannelOption alpha_type,ExceptionInfo *exception) { @@ -1095,3 +1131,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, return(status); return(SyncImagePixelCache(image,exception)); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif diff --git a/MagickCore/channel.h b/MagickCore/channel.h index b1b70ad57..157dc2333 100644 --- a/MagickCore/channel.h +++ b/MagickCore/channel.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_CHANNEL_H #define _MAGICKCORE_CHANNEL_H +#include + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include - extern MagickExport Image *ChannelFxImage(const Image *,const char *,ExceptionInfo *), *CombineImages(const Image *,const ColorspaceType,ExceptionInfo *), diff --git a/MagickCore/color-private.h b/MagickCore/color-private.h index 349cd0ec6..3b3ea0f51 100644 --- a/MagickCore/color-private.h +++ b/MagickCore/color-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_COLOR_PRIVATE_H #define _MAGICKCORE_COLOR_PRIVATE_H +#include "MagickCore/image.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" - extern MagickPrivate MagickBooleanType ColorComponentGenesis(void); diff --git a/MagickCore/color.h b/MagickCore/color.h index f487e14ed..f477b0201 100644 --- a/MagickCore/color.h +++ b/MagickCore/color.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_COLOR_H #define _MAGICKCORE_COLOR_H +#include "MagickCore/pixel.h" +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel.h" -#include "MagickCore/exception.h" - typedef enum { UndefinedCompliance, diff --git a/MagickCore/colormap-private.h b/MagickCore/colormap-private.h index b7d4e36ce..dc7dd1371 100644 --- a/MagickCore/colormap-private.h +++ b/MagickCore/colormap-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_COLORMAP_PRIVATE_H #define _MAGICKCORE_COLORMAP_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/image.h" #include "MagickCore/color.h" #include "MagickCore/exception-private.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + 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 ecebdfc6c..7dfb8fda3 100644 --- a/MagickCore/colorspace-private.h +++ b/MagickCore/colorspace-private.h @@ -18,15 +18,15 @@ #ifndef _MAGICKCORE_COLORSPACE_PRIVATE_H #define _MAGICKCORE_COLORSPACE_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/image.h" #include "MagickCore/image-private.h" #include "MagickCore/pixel.h" #include "MagickCore/pixel-accessor.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + static inline void ConvertRGBToCMYK(PixelInfo *pixel) { MagickRealType diff --git a/MagickCore/compare.h b/MagickCore/compare.h index 3eba290d5..50429dae2 100644 --- a/MagickCore/compare.h +++ b/MagickCore/compare.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_COMPARE_H #define _MAGICKCORE_COMPARE_H +#include "MagickCore/image.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" - typedef enum { UndefinedErrorMetric, diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h index 37ae0bd94..415f623b9 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -18,13 +18,6 @@ #ifndef _MAGICKCORE_COMPOSITE_PRIVATE_H #define _MAGICKCORE_COMPOSITE_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - -/* - ImageMagick Alpha Composite Inline Methods (special export) -*/ #include "MagickCore/color.h" #include "MagickCore/image.h" @@ -32,6 +25,13 @@ extern "C" { #include "MagickCore/pixel-accessor.h" #include "MagickCore/pixel-private.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +/* + ImageMagick Alpha Composite Inline Methods (special export) +*/ static inline double MagickOver_(const double p, const double alpha,const double q,const double beta) { diff --git a/MagickCore/configure.h b/MagickCore/configure.h index d950ddc77..29f1dba40 100644 --- a/MagickCore/configure.h +++ b/MagickCore/configure.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_CONFIGURE_H #define _MAGICKCORE_CONFIGURE_H +#include "MagickCore/hashmap.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/hashmap.h" - typedef struct _ConfigureInfo { char diff --git a/MagickCore/constitute.h b/MagickCore/constitute.h index a45e6220c..a77370a3b 100644 --- a/MagickCore/constitute.h +++ b/MagickCore/constitute.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_CONSTITUTE_H #define _MAGICKCORE_CONSTITUTE_H +#include "MagickCore/pixel.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel.h" - extern MagickExport Image *ConstituteImage(const size_t,const size_t,const char *,const StorageType, const void *,ExceptionInfo *), diff --git a/MagickCore/decorate.h b/MagickCore/decorate.h index c9913b742..cce483461 100644 --- a/MagickCore/decorate.h +++ b/MagickCore/decorate.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_DECORATE_H #define _MAGICKCORE_DECORATE_H +#include "MagickCore/image.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" - typedef struct _FrameInfo { size_t diff --git a/MagickCore/delegate-private.h b/MagickCore/delegate-private.h index ccdb59cf0..8f6757f62 100644 --- a/MagickCore/delegate-private.h +++ b/MagickCore/delegate-private.h @@ -18,15 +18,15 @@ #ifndef _MAGICKCORE_DELEGATE_PRIVATE_H #define _MAGICKCORE_DELEGATE_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #if defined(MAGICKCORE_GS_DELEGATE) #include "ghostscript/iapi.h" #include "ghostscript/ierrors.h" #endif +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #ifndef gs_main_instance_DEFINED # define gs_main_instance_DEFINED typedef struct gs_main_instance_s diff --git a/MagickCore/display-private.h b/MagickCore/display-private.h index 8d0581f97..c91e4ae82 100644 --- a/MagickCore/display-private.h +++ b/MagickCore/display-private.h @@ -18,13 +18,15 @@ #ifndef _MAGICKCORE_DISPLAY_PRIVATE_H #define _MAGICKCORE_DISPLAY_PRIVATE_H +#if defined(MAGICKCORE_X11_DELEGATE) +#include "MagickCore/xwindow-private.h" +#endif + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif #if defined(MAGICKCORE_X11_DELEGATE) -#include "MagickCore/xwindow-private.h" - extern MagickExport Image *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *, ExceptionInfo *); diff --git a/MagickCore/distribute-cache-private.h b/MagickCore/distribute-cache-private.h index 6b6f5ff4a..86381a568 100644 --- a/MagickCore/distribute-cache-private.h +++ b/MagickCore/distribute-cache-private.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_DISTRIBUTE_CACHE_PRIVATE_H #define _MAGICKCORE_DISTRIBUTE_CACHE_PRIVATE_H +#include "MagickCore/geometry.h" +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/geometry.h" -#include "MagickCore/exception.h" - typedef struct _DistributeCacheInfo { int diff --git a/MagickCore/distribute-cache.h b/MagickCore/distribute-cache.h index 4bfb36235..68a5e7a89 100644 --- a/MagickCore/distribute-cache.h +++ b/MagickCore/distribute-cache.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_DISTRIBUTE_CACHE_H #define _MAGICKCORE_DISTRIBUTE_CACHE_H +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/exception.h" - extern MagickExport void DistributePixelCacheServer(const int,ExceptionInfo *); diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h index 9216fdeb1..1beae0da7 100644 --- a/MagickCore/draw-private.h +++ b/MagickCore/draw-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_DRAW_PRIVATE_H #define _MAGICKCORE_DRAW_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/cache.h" #include "MagickCore/image.h" #include "MagickCore/memory_.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info, const ssize_t x,const ssize_t y,PixelInfo *fill,ExceptionInfo *exception) { diff --git a/MagickCore/draw.h b/MagickCore/draw.h index aaf679e41..0fc675f91 100644 --- a/MagickCore/draw.h +++ b/MagickCore/draw.h @@ -18,15 +18,15 @@ #ifndef _MAGICKCORE_DRAW_H #define _MAGICKCORE_DRAW_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/geometry.h" #include "MagickCore/image.h" #include "MagickCore/pixel.h" #include "MagickCore/type.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + typedef enum { UndefinedAlign, diff --git a/MagickCore/effect.h b/MagickCore/effect.h index 597e70f25..626fca4de 100644 --- a/MagickCore/effect.h +++ b/MagickCore/effect.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_EFFECT_H #define _MAGICKCORE_EFFECT_H +#include "MagickCore/morphology.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/morphology.h" - typedef enum { UndefinedPreview, diff --git a/MagickCore/enhance.h b/MagickCore/enhance.h index 1ba93fcb2..3b04f97ab 100644 --- a/MagickCore/enhance.h +++ b/MagickCore/enhance.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_ENHANCE_H #define _MAGICKCORE_ENHANCE_H +#include "MagickCore/pixel.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel.h" - extern MagickExport MagickBooleanType AutoGammaImage(Image *,ExceptionInfo *), AutoLevelImage(Image *,ExceptionInfo *), diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h index 66802ec17..821feb44f 100644 --- a/MagickCore/exception-private.h +++ b/MagickCore/exception-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_EXCEPTION_PRIVATE_H #define _MAGICKCORE_EXCEPTION_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/log.h" #include "MagickCore/magick.h" #include "MagickCore/string_.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #define ThrowBinaryException(severity,tag,context) \ { \ if (image != (Image *) NULL) \ diff --git a/MagickCore/exception.h b/MagickCore/exception.h index 7930a624a..a1b1b5a37 100644 --- a/MagickCore/exception.h +++ b/MagickCore/exception.h @@ -18,13 +18,12 @@ #ifndef _MAGICKCORE_EXCEPTION_H #define _MAGICKCORE_EXCEPTION_H +#include "MagickCore/semaphore.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include -#include "MagickCore/semaphore.h" - typedef enum { UndefinedException, diff --git a/MagickCore/fx.h b/MagickCore/fx.h index 74c507194..e8fde7a2c 100644 --- a/MagickCore/fx.h +++ b/MagickCore/fx.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_FX_H #define _MAGICKCORE_FX_H +#include "MagickCore/draw.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/draw.h" - typedef enum { UndefinedNoise, diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h index e255ee4a5..f3ca0dc53 100644 --- a/MagickCore/gem-private.h +++ b/MagickCore/gem-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_GEM_PRIVATE_H #define _MAGICKCORE_GEM_PRIVATE_H +#include "MagickCore/pixel-private.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel-private.h" - #define D65X 0.950456 #define D65Y 1.0 #define D65Z 1.088754 diff --git a/MagickCore/gem.h b/MagickCore/gem.h index f875ddf90..bb4c026bf 100644 --- a/MagickCore/gem.h +++ b/MagickCore/gem.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_GEM_H #define _MAGICKCORE_GEM_H +#include "MagickCore/fx.h" +#include "MagickCore/random_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#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 5447351f2..18f938c2a 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_IMAGE_H #define _MAGICKCORE_IMAGE_H +#include "MagickCore/color.h" +#include "MagickCore/pixel.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#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 386d88694..19dd7e4c3 100644 --- a/MagickCore/layer.h +++ b/MagickCore/layer.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_LAYER_H #define _MAGICKCORE_LAYER_H +#include "MagickCore/composite.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/composite.h" - typedef enum { UnrecognizedDispose, diff --git a/MagickCore/locale_.h b/MagickCore/locale_.h index 4efaa2d09..cad356b54 100644 --- a/MagickCore/locale_.h +++ b/MagickCore/locale_.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_LOCALE_H #define _MAGICKCORE_LOCALE_H +#include "MagickCore/hashmap.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/hashmap.h" - typedef struct _LocaleInfo { char diff --git a/MagickCore/log-private.h b/MagickCore/log-private.h index 7043157ef..2ac9d86b3 100644 --- a/MagickCore/log-private.h +++ b/MagickCore/log-private.h @@ -18,13 +18,12 @@ #ifndef _MAGICKCORE_LOG_PRIVATE_H #define _MAGICKCORE_LOG_PRIVATE_H +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include -#include "MagickCore/exception.h" - extern MagickPrivate MagickBooleanType LogComponentGenesis(void); diff --git a/MagickCore/log.h b/MagickCore/log.h index e74795f32..d58715df2 100644 --- a/MagickCore/log.h +++ b/MagickCore/log.h @@ -18,13 +18,12 @@ #ifndef _MAGICKCORE_LOG_H #define _MAGICKCORE_LOG_H +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include -#include "MagickCore/exception.h" - #if !defined(GetMagickModule) # define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__ #endif diff --git a/MagickCore/mac.h b/MagickCore/mac.h index ed9c964b8..19e1afe59 100644 --- a/MagickCore/mac.h +++ b/MagickCore/mac.h @@ -18,15 +18,15 @@ #ifndef _MAGICKCORE_MAC_H #define _MAGICKCORE_MAC_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include #include #include #include +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #if defined(_MAGICKCORE_POSIX_SUPPORT_VERSION) # include # if !defined(DISABLE_SIOUX) diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index 08155af08..db3dc9b9a 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_MAGICK_TYPE_H #define _MAGICKCORE_MAGICK_TYPE_H +#include "MagickCore/magick-config.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/magick-config.h" - #if !defined(MAGICKCORE_QUANTUM_DEPTH) #define MAGICKCORE_QUANTUM_DEPTH 16 #endif diff --git a/MagickCore/module.h b/MagickCore/module.h index 6e2721499..88e660e4c 100644 --- a/MagickCore/module.h +++ b/MagickCore/module.h @@ -18,13 +18,12 @@ #ifndef _MAGICKCORE_MODULE_H #define _MAGICKCORE_MODULE_H +#include "MagickCore/version.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include -#include "MagickCore/version.h" - #define MagickImageCoderSignature ((size_t) \ (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH)) #define MagickImageFilterSignature ((size_t) \ diff --git a/MagickCore/monitor-private.h b/MagickCore/monitor-private.h index ac1720525..c94d8e97f 100644 --- a/MagickCore/monitor-private.h +++ b/MagickCore/monitor-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICK_MONITOR_PRIVATE_H #define _MAGICK_MONITOR_PRIVATE_H +#include "MagickCore/image.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#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 8505184c5..5ea762da4 100644 --- a/MagickCore/morphology-private.h +++ b/MagickCore/morphology-private.h @@ -18,16 +18,12 @@ #ifndef _MAGICK_MORPHOLOGY_PRIVATE_H #define _MAGICK_MORPHOLOGY_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif +#include "MagickCore/morphology.h" #if defined(__cplusplus) || defined(c_plusplus) -} +extern "C" { #endif -#include "MagickCore/morphology.h" - extern MagickPrivate Image *MorphologyApply(const Image *,const MorphologyMethod,const ssize_t, const KernelInfo *,const CompositeOperator,const double,ExceptionInfo *); @@ -36,4 +32,8 @@ extern MagickPrivate void ShowKernelInfo(const KernelInfo *), ZeroKernelNans(KernelInfo *); +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + #endif diff --git a/MagickCore/morphology.h b/MagickCore/morphology.h index 205717c89..25e0f17bb 100644 --- a/MagickCore/morphology.h +++ b/MagickCore/morphology.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_MORPHOLOGY_H #define _MAGICKCORE_MORPHOLOGY_H +#include "MagickCore/geometry.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/geometry.h" - typedef enum { UndefinedKernel, /* equivalent to UnityKernel */ diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index 9acc1a8e0..119ac787f 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -18,17 +18,17 @@ #ifndef _MAGICKCORE_NT_BASE_PRIVATE_H #define _MAGICKCORE_NT_BASE_PRIVATE_H +#include "MagickCore/delegate.h" +#include "MagickCore/delegate-private.h" +#include "MagickCore/exception.h" +#include "MagickCore/splay-tree.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif #if defined(MAGICKCORE_WINDOWS_SUPPORT) -#include "MagickCore/delegate.h" -#include "MagickCore/delegate-private.h" -#include "MagickCore/exception.h" -#include "MagickCore/splay-tree.h" - #define WIN32_LEAN_AND_MEAN #define VC_EXTRALEAN #define _CRT_SECURE_NO_DEPRECATE 1 diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h index 3928f1729..041ebe052 100644 --- a/MagickCore/nt-base.h +++ b/MagickCore/nt-base.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_NT_BASE_H #define _MAGICKCORE_NT_BASE_H +#include "MagickCore/exception.h" +#include "MagickCore/geometry.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/exception.h" -#include "MagickCore/geometry.h" - #if defined(MAGICKCORE_WINDOWS_SUPPORT) typedef struct _GhostInfo GhostInfo_; diff --git a/MagickCore/nt-feature.h b/MagickCore/nt-feature.h index 81b9d8360..40cb6dba2 100644 --- a/MagickCore/nt-feature.h +++ b/MagickCore/nt-feature.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_NT_FEATURE_H #define _MAGICKCORE_NT_FEATURE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/exception.h" #include "MagickCore/geometry.h" #include "MagickCore/splay-tree.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + extern MagickExport void *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), *ImageToHBITMAP(Image *,ExceptionInfo *); diff --git a/MagickCore/opencl-private.h b/MagickCore/opencl-private.h index b58597616..7264366ae 100644 --- a/MagickCore/opencl-private.h +++ b/MagickCore/opencl-private.h @@ -1,26 +1,23 @@ /* -Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization -dedicated to making software imaging solutions freely available. + Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. -You may not use this file except in compliance with the License. -obtain a copy of the License at + You may not use this file except in compliance with the License. + obtain a copy of the License at -http://www.imagemagick.org/script/license.php + http://www.imagemagick.org/script/license.php -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -MagickCore OpenCL private methods. + MagickCore OpenCL private methods. */ #ifndef _MAGICKCORE_OPENCL_PRIVATE_H #define _MAGICKCORE_OPENCL_PRIVATE_H -/* -Include declarations. -*/ #include "MagickCore/studio.h" #include "MagickCore/opencl.h" diff --git a/MagickCore/paint.h b/MagickCore/paint.h index bd3e9e945..aa718d39b 100644 --- a/MagickCore/paint.h +++ b/MagickCore/paint.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_PAINT_H #define _MAGICKCORE_PAINT_H +#include "MagickCore/color.h" +#include "MagickCore/draw.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/color.h" -#include "MagickCore/draw.h" - extern MagickExport Image *OilPaintImage(const Image *,const double,const double,ExceptionInfo *); diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index c35c5b397..d6054083e 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -18,11 +18,6 @@ #ifndef _MAGICKCORE_PIXEL_ACCESSOR_H #define _MAGICKCORE_PIXEL_ACCESSOR_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - -#include #include "MagickCore/cache.h" #include "MagickCore/cache-view.h" #include "MagickCore/color.h" @@ -30,6 +25,10 @@ extern "C" { #include "MagickCore/gem.h" #include "MagickCore/image.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #undef index static inline Quantum GetPixela(const Image *restrict image, diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index 216b79245..d607a3085 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_PIXEL_H #define _MAGICKCORE_PIXEL_H +#include "MagickCore/colorspace.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/colorspace.h" - #define MaxPixelChannels 32 #undef index diff --git a/MagickCore/policy.h b/MagickCore/policy.h index 8eadbdf6f..2ea48b25a 100644 --- a/MagickCore/policy.h +++ b/MagickCore/policy.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_POLICY_H #define _MAGICKCORE_POLICY_H +#include "MagickCore/pixel.h" +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/pixel.h" -#include "MagickCore/exception.h" - typedef enum { UndefinedPolicyDomain, diff --git a/MagickCore/profile-private.h b/MagickCore/profile-private.h index 4adf3a7a6..10938b0e6 100644 --- a/MagickCore/profile-private.h +++ b/MagickCore/profile-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_PROFILE_PRIVATE_H #define _MAGICKCORE_PROFILE_PRIVATE_H +#include "MagickCore/string_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/string_.h" - extern MagickPrivate MagickBooleanType SyncImageProfiles(Image *); diff --git a/MagickCore/profile.h b/MagickCore/profile.h index 33176a649..948854854 100644 --- a/MagickCore/profile.h +++ b/MagickCore/profile.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_PROFILE_H #define _MAGICKCORE_PROFILE_H +#include "MagickCore/string_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/string_.h" - typedef struct _ProfileInfo ProfileInfo; diff --git a/MagickCore/quantize.h b/MagickCore/quantize.h index bf462dcfd..b1961b34c 100644 --- a/MagickCore/quantize.h +++ b/MagickCore/quantize.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_QUANTIZE_H #define _MAGICKCORE_QUANTIZE_H +#include "MagickCore/colorspace.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/colorspace.h" - typedef enum { UndefinedDitherMethod, diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h index 470fa4523..cd46e54ce 100644 --- a/MagickCore/quantum-private.h +++ b/MagickCore/quantum-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_QUANTUM_PRIVATE_H #define _MAGICKCORE_QUANTUM_PRIVATE_H +#include "MagickCore/cache.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/cache.h" - typedef struct _QuantumState { double diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h index ba949a780..5f2ee6899 100644 --- a/MagickCore/quantum.h +++ b/MagickCore/quantum.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_QUANTUM_H #define _MAGICKCORE_QUANTUM_H +#include "MagickCore/image.h" +#include "MagickCore/semaphore.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/image.h" -#include "MagickCore/semaphore.h" - typedef enum { UndefinedEndian, diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h index 84f682c67..7f0c0591c 100644 --- a/MagickCore/random-private.h +++ b/MagickCore/random-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_RANDOM_PRIVATE_H #define _MAGICKCORE_RANDOM_PRIVATE_H +#include "MagickCore/thread-private.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/thread-private.h" - extern MagickPrivate double GetRandomInfoNormalize(RandomInfo *); diff --git a/MagickCore/random_.h b/MagickCore/random_.h index 57e4fec30..fcf478b5b 100644 --- a/MagickCore/random_.h +++ b/MagickCore/random_.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_RANDOM__H #define _MAGICKCORE_RANDOM__H +#include "MagickCore/string_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/string_.h" - /* Typedef declarations. */ diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h index 9df98254c..c182ca01a 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_RESAMPLE_PRIVATE_H #define _MAGICKCORE_RESAMPLE_PRIVATE_H +#include "MagickCore/thread-private.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/thread-private.h" - static inline ResampleFilter **DestroyResampleFilterThreadSet( ResampleFilter **filter) { diff --git a/MagickCore/resample.h b/MagickCore/resample.h index 77ab870c2..239674a44 100644 --- a/MagickCore/resample.h +++ b/MagickCore/resample.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_RESAMPLE_H #define _MAGICKCORE_RESAMPLE_H +#include "MagickCore/cache-view.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/cache-view.h" - /* WARNING: The order of this table must also match the order of a table located in AcquireResizeFilter() in "resize.c" otherwise the users filter diff --git a/MagickCore/signature-private.h b/MagickCore/signature-private.h index 6c3d3292e..646887681 100644 --- a/MagickCore/signature-private.h +++ b/MagickCore/signature-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_SIGNATURE_PRIVATE_H #define _MAGICKCORE_SIGNATURE_PRIVATE_H +#include "MagickCore/string_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif #define MagickSignatureSize 64 -#include "MagickCore/string_.h" - typedef struct _SignatureInfo SignatureInfo; diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h index a833a89c3..563df3204 100644 --- a/MagickCore/string-private.h +++ b/MagickCore/string-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_STRING_PRIVATE_H #define _MAGICKCORE_STRING_PRIVATE_H +#include "MagickCore/locale_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/locale_.h" - static inline double SiPrefixToDoubleInterval(const char *string, const double interval) { diff --git a/MagickCore/string_.h b/MagickCore/string_.h index 589c3bede..cf734cc49 100644 --- a/MagickCore/string_.h +++ b/MagickCore/string_.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_STRING_H_ #define _MAGICKCORE_STRING_H_ +#include "MagickCore/exception.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/exception.h" - typedef struct _StringInfo { char diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index c66abe26b..b681ad570 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_THREAD_PRIVATE_H #define _MAGICKCORE_THREAD_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/cache.h" #include "MagickCore/resource_.h" #include "MagickCore/thread_.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + /* Single threaded unless workload justifies the threading overhead. */ diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h index e1314a0b0..783c46fe5 100644 --- a/MagickCore/utility-private.h +++ b/MagickCore/utility-private.h @@ -18,14 +18,14 @@ #ifndef _MAGICKCORE_UTILITY_PRIVATE_H #define _MAGICKCORE_UTILITY_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/memory_.h" #include "MagickCore/nt-base.h" #include "MagickCore/nt-base-private.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + extern MagickPrivate char **GetPathComponents(const char *,size_t *), **ListFiles(const char *,const char *,size_t *); diff --git a/MagickCore/version-private.h b/MagickCore/version-private.h index 967d554b1..9b96eb946 100644 --- a/MagickCore/version-private.h +++ b/MagickCore/version-private.h @@ -18,12 +18,12 @@ #ifndef _MAGICKCORE_VERSION_PRIVATE_H #define _MAGICKCORE_VERSION_PRIVATE_H +#include "MagickCore/string_.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/string_.h" - extern MagickExport unsigned int GetMagickSignature(const StringInfo *); diff --git a/MagickCore/version.c b/MagickCore/version.c index 52b2bf185..caea7da00 100644 --- a/MagickCore/version.c +++ b/MagickCore/version.c @@ -458,6 +458,10 @@ static unsigned int CRC32(const unsigned char *message,const size_t length) return(crc ^ 0xFFFFFFFF); } +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + MagickExport unsigned int GetMagickSignature(const StringInfo *nonce) { register unsigned char @@ -490,6 +494,10 @@ MagickExport unsigned int GetMagickSignature(const StringInfo *nonce) version=DestroyStringInfo(version); return(signature); } + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/MagickCore/widget-private.h b/MagickCore/widget-private.h index eb5f74268..68bebbfff 100644 --- a/MagickCore/widget-private.h +++ b/MagickCore/widget-private.h @@ -18,14 +18,13 @@ #ifndef _MAGICKCORE_WIDGET_PRIVATE_H #define _MAGICKCORE_WIDGET_PRIVATE_H +#include "MagickCore/xwindow-private.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif #if defined(MAGICKCORE_X11_DELEGATE) - -#include "MagickCore/xwindow-private.h" - extern MagickPrivate int XCommandWidget(Display *,XWindows *,const char **,XEvent *), XConfirmWidget(Display *,XWindows *,const char *,const char *), diff --git a/MagickCore/xml-tree-private.h b/MagickCore/xml-tree-private.h index 28133559c..a954cedb0 100644 --- a/MagickCore/xml-tree-private.h +++ b/MagickCore/xml-tree-private.h @@ -18,13 +18,13 @@ #ifndef _MAGICKCORE_XML_TREE_PRIVATE_H #define _MAGICKCORE_XML_TREE_PRIVATE_H +#include "MagickCore/exception.h" +#include "MagickCore/splay-tree.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickCore/exception.h" -#include "MagickCore/splay-tree.h" - extern MagickPrivate char *CanonicalXMLContent(const char *,const MagickBooleanType); diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h index 38a37bfcf..bace65876 100644 --- a/MagickCore/xwindow-private.h +++ b/MagickCore/xwindow-private.h @@ -18,16 +18,16 @@ #ifndef _MAGICKCORE_XWINDOW_PRIVATE_H #define _MAGICKCORE_XWINDOW_PRIVATE_H -#if defined(__cplusplus) || defined(c_plusplus) -extern "C" { -#endif - #include "MagickCore/draw.h" #include "MagickCore/exception.h" #include "MagickCore/geometry.h" #include "MagickCore/pixel-accessor.h" #include "MagickCore/quantize.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + #if defined(MAGICKCORE_X11_DELEGATE) #include diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h index aaa2a04f2..9081977fd 100644 --- a/MagickWand/MagickWand.h +++ b/MagickWand/MagickWand.h @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #if defined(WIN32) || defined(WIN64) # define MAGICKWAND_WINDOWS_SUPPORT diff --git a/MagickWand/convert.c b/MagickWand/convert.c index 0d47abc13..9859b7b1d 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -1054,16 +1054,15 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, if (LocaleCompare("complex",option+1) == 0) { ssize_t - operator; + op; if (*option == '+') break; i++; if (i == (ssize_t) argc) ThrowConvertException(OptionError,"MissingArgument",option); - operator=ParseCommandOption(MagickComplexOptions,MagickFalse, - argv[i]); - if (operator < 0) + op=ParseCommandOption(MagickComplexOptions,MagickFalse,argv[i]); + if (op < 0) ThrowConvertException(OptionError,"UnrecognizedComplexOperator", argv[i]); break; diff --git a/MagickWand/drawing-wand.h b/MagickWand/drawing-wand.h index d50d06f09..ef2dda1ec 100644 --- a/MagickWand/drawing-wand.h +++ b/MagickWand/drawing-wand.h @@ -18,12 +18,12 @@ #ifndef _MAGICKWAND_DRAWING_WAND_H #define _MAGICKWAND_DRAWING_WAND_H +#include "MagickWand/pixel-wand.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickWand/pixel-wand.h" - typedef struct _DrawingWand DrawingWand; diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index c2cbdd6c8..7f47755fa 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -7577,15 +7577,15 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, if (LocaleCompare("complex",option+1) == 0) { ComplexOperator - operator; + op; Image *complex_images; (void) SyncImageSettings(mogrify_info,*images,exception); - operator=(ComplexOperator) ParseCommandOption(MagickComplexOptions, + op=(ComplexOperator) ParseCommandOption(MagickComplexOptions, MagickFalse,argv[i+1]); - complex_images=ComplexImages(*images,operator,exception); + complex_images=ComplexImages(*images,op,exception); if (complex_images == (Image *) NULL) { status=MagickFalse; diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 34fbea521..2037de631 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -4327,10 +4327,10 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, /* if new image list generated, replace existing image list */ if (new_images == (Image *) NULL) - return(status); + return(status == 0 ? MagickFalse : MagickTrue); _images=DestroyImageList(_images); _images=GetFirstImageInList(new_images); - return(status); + return(status == 0 ? MagickFalse : MagickTrue); #undef _image_info #undef _images diff --git a/MagickWand/pixel-iterator.h b/MagickWand/pixel-iterator.h index 433d0e9d0..435c59238 100644 --- a/MagickWand/pixel-iterator.h +++ b/MagickWand/pixel-iterator.h @@ -18,13 +18,13 @@ #ifndef _MAGICKWAND_PIXEL_ITERATOR_H #define _MAGICKWAND_PIXEL_ITERATOR_H +#include "MagickWand/MagickWand.h" +#include "MagickWand/pixel-wand.h" + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "MagickWand/MagickWand.h" -#include "MagickWand/pixel-wand.h" - typedef struct _PixelIterator PixelIterator; diff --git a/coders/dcm.c b/coders/dcm.c index 698766055..9c160143e 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3074,7 +3074,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) data[length*quantum]='\0'; } else - if (datum == 0xFFFFFFFF) + if (datum == 0xFFFFFFFFL) { sequence=MagickTrue; continue; diff --git a/coders/dds.c b/coders/dds.c index 13191d550..002cdf64e 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -1022,7 +1022,7 @@ static size_t CompressAlpha(const size_t min, const size_t max, codes[6] = 0; codes[7] = 255; - for (i=1; i < steps; i++) + for (i=1; i < (ssize_t) steps; i++) codes[i+1] = (unsigned char) (((steps-i)*min + i*max) / steps); error = 0; @@ -1311,7 +1311,7 @@ static void CompressRangeFit(const size_t count, VectorCopy43(points[0],end); min = max = Dot(points[0],principle); - for (i=1; i < count; i++) + for (i=1; i < (ssize_t) count; i++) { val = Dot(points[i],principle); if (val < min) @@ -1346,7 +1346,7 @@ static void CompressRangeFit(const size_t count, codes[3].y = (start->y * (1.0f/3.0f)) + (end->y * (2.0f/3.0f)); codes[3].z = (start->z * (1.0f/3.0f)) + (end->z * (2.0f/3.0f)); - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) { bestDist = 1e+37f; bestj = 0; @@ -1551,13 +1551,13 @@ static MagickBooleanType ConstructOrdering(const size_t count, o = order + (16*iteration); - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) { dps[i] = Dot(points[i],axis); o[i] = (unsigned char)i; } - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) { for (j=i; j > 0 && dps[j] < dps[j - 1]; j--) { @@ -1571,7 +1571,7 @@ static MagickBooleanType ConstructOrdering(const size_t count, } } - for (i=0; i < iteration; i++) + for (i=0; i < (ssize_t) iteration; i++) { MagickBooleanType same; @@ -1597,7 +1597,7 @@ static MagickBooleanType ConstructOrdering(const size_t count, xSumwSum->z = 0; xSumwSum->w = 0; - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) { DDSVector4 v; @@ -2769,9 +2769,9 @@ static void WriteFourCC(Image *image, const size_t compression, alphas[i] = -1; } - for (by=0; by < rows; by++) + for (by=0; by < (ssize_t) rows; by++) { - for (bx=0; bx < columns; bx++) + for (bx=0; bx < (ssize_t) columns; bx++) { if (compression == FOURCC_DXT5) alpha = ScaleQuantumToChar(GetPixelAlpha(image,p)); @@ -2787,7 +2787,7 @@ static void WriteFourCC(Image *image, const size_t compression, p+=GetPixelChannels(image); match = MagickFalse; - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) { if ((points[i].x == point.x) && (points[i].y == point.y) && @@ -2825,7 +2825,7 @@ static void WriteFourCC(Image *image, const size_t compression, } } - for (i=0; i < count; i++) + for (i=0; i < (ssize_t) count; i++) points[i].w = sqrt(points[i].w); if (compression == FOURCC_DXT5) @@ -2933,7 +2933,7 @@ static MagickBooleanType WriteMipmaps(Image *image, const size_t pixelFormat, columns = image->columns; rows = image->rows; - for (i=0; i