(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index b1eef0234c89f5f7842ff62bcdc8a9b05bc1e8ea..6670b8f3a96a1a7f88eb237ab5551d01fabba06a 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -57,6 +57,7 @@ extern "C" {
 #include <stdlib.h>
 #include <math.h>
 #include <sys/types.h>
+#include <time.h>
 
 #if defined(WIN32) || defined(WIN64)
 #  define MAGICKCORE_WINDOWS_SUPPORT

diff --git a/MagickCore/animate-private.h b/MagickCore/animate-private.h
index c295c5de6cabd1ff0d534c17e590736c8b563d31..01e5357780e4bdc4f8cd2137745919e875c883b7 100644 (file)
--- 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 8a7cde531528703b4521df0e8b917d6d366f41b8..e42d6899901b9cc1cf003f2a9f77b282e3a99824 100644 (file)
--- 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 27916c92f07d20fb9bc10e4707eb2860a78b9bf0..ffbe4468e897452aed87e3e9957c288f8753c66d 100644 (file)
--- 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 4000fdc8288eb1551ca97bbe13ccf4f5ce113cc1..317463748c2ceff8473054d84cfa06da04260f13 100644 (file)
--- 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 6304d4f2675d6d5281d87fc5e6978e1a7994254b..03c06cdd2493cab89194df7c600769a6b39dc8c9 100644 (file)
--- 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 3be96a9750da3ca97817f05090817dd4a7cf0d47..e27142aabc9de62aba2fa667ea637b4ae3e56c26 100644 (file)
--- 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 <time.h>
 #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 b943f87a6adb94922fb9d957b5b55c653c50dafd..0e74969d0466272b192630baab4385781955aa6d 100644 (file)
--- 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 87b0460fbebbd9942168c3acb7a7dd222cf94b88..e606e6db9cd8d60639a00b3ce1b7fefa25595770 100644 (file)
--- 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 440806918bb87e5e34b0f0cb1f3207895271bb36..2430bf1461cd6a7705703228e910fbacdec7b652 100644 (file)
--- 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
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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 b1b70ad572503ff1339b68a4cca258924e7f72a0..157dc233314bdb945b95f5ea1bc77563db463b73 100644 (file)
--- a/MagickCore/channel.h
+++ b/MagickCore/channel.h
@@ -18,12 +18,12 @@
 #ifndef _MAGICKCORE_CHANNEL_H
 #define _MAGICKCORE_CHANNEL_H
 
+#include <MagickCore/image.h>
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include <MagickCore/image.h>
-
 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 349cd0ec6ebc8a7707fe338d7866ca6b6d409d42..3b3ea0f5143cae00ea9825b9f9df741b04509ff7 100644 (file)
--- 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 f487e14edfbf198ac78703ffe90571f2895e424e..f477b020149f63ca7808c56949ec4b3a4ce59723 100644 (file)
--- 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 b7d4e36ceaaeafce7254563a1f8af530e4c964b8..dc7dd1371384059693f3c6cedad06ce8829f9ae4 100644 (file)
--- 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 ecebdfc6cfbbca1c9291afb8f070ed0a5adc9bae..7dfb8fda3389cc8f2bcf33e1a34ba1e6e98078a2 100644 (file)
--- 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 3eba290d54135ea47231269ce6bb78f414d52d13..50429dae28aab21b422db0f4a2f5384cb2f77d28 100644 (file)
--- 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 37ae0bd947a61dedaa65518c3b9c58a528c8683e..415f623b9f7cf2b11c8fda21773c5b57e3d5e445 100644 (file)
--- 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 d950ddc77908a6e65f8a6f873a2653654c52762b..29f1dba4070fc47671c73b7e6b341a86b2be4e6d 100644 (file)
--- 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 a45e6220c876c88ee4330d9b02da9ac253416d35..a77370a3b1b77660a5027546155a19d8184b66c9 100644 (file)
--- 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 c9913b74281ba9951d8cd29c31f09550e21b0294..cce483461ae7396dad22477f952d39c5a35c0b29 100644 (file)
--- 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 ccdb59cf00ccc1dd586d1a11ac01e998f2494aa2..8f6757f624a90e1750d02b995c768caa17947e05 100644 (file)
--- 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 8d0581f97e0fffc9485761fa851b3b401ba9b771..c91e4ae823b4e19de4069fb4841ce4673d88d564 100644 (file)
--- 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 6b6f5ff4a2b06b700227a513c26bd964b0d719ed..86381a5681af76eed4ce026b8237716e19be0740 100644 (file)
--- 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 4bfb36235dffca34d02a7b04f3efae4394983744..68a5e7a893d412a1b9f6f69d4ef5504e058b40b4 100644 (file)
--- 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 9216fdeb1a6060190dd873a9417212b428d28892..1beae0da7c9c2b53ef48bb27b05b96328313b604 100644 (file)
--- 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 aaf679e4146129513f4e8b8c6d87e333a760f6b1..0fc675f9164812a61df900f58a11a2d1e4a40e60 100644 (file)
--- 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 597e70f25c389722deddb378514c287ad34cd147..626fca4de9f3495c1540c2b496f9c50fbac44814 100644 (file)
--- 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 1ba93fcb2b119c8eb909c1ed72aa448d5edf4470..3b04f97abbc85bad77c1ee272a7be727e80b168e 100644 (file)
--- 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 66802ec17afe322b71e58ae9babcd1b9b34d69cf..821feb44f0d692dd93391faa79dfe722c818138a 100644 (file)
--- 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 7930a624ae82e3b03d722720b867736649e4c293..a1b1b5a3758f09b22f453a05f9ecb994cc561da6 100644 (file)
--- 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 <stdarg.h>
-#include "MagickCore/semaphore.h"
-
 typedef enum
 {
   UndefinedException,

diff --git a/MagickCore/fx.h b/MagickCore/fx.h
index 74c507194ece54cc0e092a7f59a05671003b6e9e..e8fde7a2cf7b6e688a84479d20a88491237add24 100644 (file)
--- 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 e255ee4a59fd975196fdb9cfc0801bb40803c3c7..f3ca0dc537efcd0deaeee56559cc64d1d1888bf1 100644 (file)
--- 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 f875ddf90f898097d20080353a37c723a2ea71b3..bb4c026bf3b8dbb54ed5e748c97ca9f80aaa56f0 100644 (file)
--- 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 5447351f20b5de12a34edc12c640d7082a2f715e..18f938c2ab359ef0d7f4171a4a3cc0085a8be0e7 100644 (file)
--- 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 386d88694918f80914d00a507188c413f0553d15..19dd7e4c3c50bb09bece99eb77574bfbf6f15c2f 100644 (file)
--- 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 4efaa2d097dcceedb4f62544b92f291c6f8f57a5..cad356b544345ea2088c02a8a8009eb2a31331cc 100644 (file)
--- 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 7043157eff266fd9b188f30bb7ce1a1093287ea1..2ac9d86b3fcf7b3ed6e85d8b7969fbbeab8bdc12 100644 (file)
--- 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 <stdarg.h>
-#include "MagickCore/exception.h"
-
 extern MagickPrivate MagickBooleanType
   LogComponentGenesis(void);
 

diff --git a/MagickCore/log.h b/MagickCore/log.h
index e74795f32c8da2edafb22397f29338312081cdd7..d58715df2924a42b439ef215890e7831915a3841 100644 (file)
--- 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 <stdarg.h>
-#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 ed9c964b80e69bc1aad1b27e83484d3cf7b5b8a3..19e1afe5910e2fdf544cd68bd8fa29813f397556 100644 (file)
--- 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 <locale.h>
 #include <Errors.h>
 #include <Files.h>
 #include <errno.h>
 
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 #if defined(_MAGICKCORE_POSIX_SUPPORT_VERSION)
 # include <dirent.h>
 # if !defined(DISABLE_SIOUX)

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 08155af08993a14b171c79aefcced2b27f85baf1..db3dc9b9a4ba2b9863da6aa4be4444e0919a742f 100644 (file)
--- 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 6e27214994fd7f0de5b77b413b1d2fdd495a5e89..88e660e4c7eeb57ac481acbee1dab62b522b2077 100644 (file)
--- 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 <time.h>
-#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 ac1720525a8955468050094c4a689be26b3296d2..c94d8e97f90a15a510d662812750d65c7ece2d1d 100644 (file)
--- 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 8505184c5e42f0c9788171bd15585d1b12930301..5ea762da4daf5e644ddd5f630543199db0fc535f 100644 (file)
--- 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 205717c89a243c298a5dea98126c4da8ac9781bb..25e0f17bb408d0353b67b51cf93e82dc2fcc71ed 100644 (file)
--- 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 9acc1a8e0feb1e866e6ed31c5676d9e3aa5b9fba..119ac787f3c1b9ac7853db6bd1c35d9d6870fbe7 100644 (file)
--- 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 3928f1729ff570fb6c8da6a496669af017825c69..041ebe0521e5e8cd4c317963910c1ebb386a8df7 100644 (file)
--- 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 81b9d8360cca41f1647e22b0088729837b88f872..40cb6dba2c9786be60911f1bc23c27da6653b24c 100644 (file)
--- 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 b5859761648d2446206db77e144a6dc739ac2360..7264366ae42e4aaeaa47356156db4e089f35e201 100644 (file)
--- 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 bd3e9e945b0e00982b01a41ad7a06da0a9a8f35e..aa718d39bf3350d028606fab509794b7062fa75b 100644 (file)
--- 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 c35c5b39701b6ef6da0ab69eacbfeea04f1ab11a..d6054083ee1a37ba91a086dba01f89d496f23cad 100644 (file)
--- 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 <math.h>
 #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 216b79245e8f680f7af1eaa0531213f66d4a9ca8..d607a30855fae4dfb8a9cdbe550844e96575b759 100644 (file)
--- 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 8eadbdf6f62c4b8a72927731175dc659ab9a136d..2ea48b25a69e34c1f63f6a93f326b4193c367745 100644 (file)
--- 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 4adf3a7a63a5f8a20a0b6440ceb66a6bbef06bfe..10938b0e659f78cf202329b07e00abaafa6ab5bd 100644 (file)
--- 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 33176a6499288fe6d3b0b874d6f28f040436393c..9488548549834ff5cd940e9bfa8683dd1fd95c07 100644 (file)
--- 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 bf462dcfddd9cee034a1d23d2b24693924e73961..b1961b34ce2b3d759bc359420d59fdbb4714b7b4 100644 (file)
--- 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 470fa45231cc86b5670157a3bd081909c2d08563..cd46e54ced9c859e9c019123a6edac45d7a8ca83 100644 (file)
--- 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 ba949a780cd7e313f34add81a55df8c556f8777f..5f2ee689969d9c5a9765929d5b10c760bc322529 100644 (file)
--- 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 84f682c671f07491df254d1e7f5f928979c721d2..7f0c0591c416d34019f53d84d3243f5c42f73076 100644 (file)
--- 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 57e4fec309e2f57ab93f10d54520536328061fbd..fcf478b5b72b73f76a7d8c8f61c4fc81fc88b4b6 100644 (file)
--- 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 9df98254c8043488e9f9b579efe02aa99d3fe46e..c182ca01a6695149ca3c365f1a33256af1820f3b 100644 (file)
--- 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 77ab870c25c3a653fe65cc4cfb9d01bc3a65854b..239674a4427332d378e5eb7f782e76f4f71ccf67 100644 (file)
--- 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 6c3d3292e0d3ce5592c24142ea3b166c138db89f..646887681773f5840459dbf3607c528cb88164eb 100644 (file)
--- 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 a833a89c3d1d8b7c5d66298e7b6dc5c6e6c0cd0c..563df3204fef4c9c6775f44564ca8dcab4811284 100644 (file)
--- 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 589c3bedea799dcdb70eb9c161a3dc7cd119e54e..cf734cc49e376fa1ad0f430e3d2cc181a216aa93 100644 (file)
--- 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 c66abe26b6cea2efbea84f7c07155d3a398060fe..b681ad5703313e967bdd06a5193945e33ff2b3b5 100644 (file)
--- 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 e1314a0b025738699532446767f410c139766d4a..783c46fe5e921a5ec9e5ac2b28e10dc1172b6455 100644 (file)
--- 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 967d554b123dae167523389ab103b17b368d6927..9b96eb946442bdc28b86b1320cb272ac464819d3 100644 (file)
--- 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 52b2bf185128319172bd696c73516bb4e90b8d65..caea7da0038f949992d91181fd75c11475c54592 100644 (file)
--- 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
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickCore/widget-private.h b/MagickCore/widget-private.h
index eb5f7426869c27f45aabd2a89eda7e84c581f635..68bebbfff6e112938cd4419f6fcb20911ac178a2 100644 (file)
--- 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 28133559c1c4e6d80d53b178b48179fe564d1420..a954cedb0a4c72167b75c17a9579ae502870c914 100644 (file)
--- 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 38a37bfcf82583e189a82397085828cf05c893a7..bace65876f0e0f98bba9d89fa354d87c3c62f015 100644 (file)
--- 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 <X11/Xos.h>

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index aaa2a04f290e4aaf1259d852f980ce25a055e283..9081977fd4e105f97b8e52e53599d6671c504225 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -57,6 +57,7 @@ extern "C" {
 #include <stdlib.h>
 #include <math.h>
 #include <sys/types.h>
+#include <time.h>
 
 #if defined(WIN32) || defined(WIN64)
 #  define MAGICKWAND_WINDOWS_SUPPORT

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 0d47abc13a7ee00ab2c5d980605dc7b0456a372d..9859b7b1d681d70ad8de749a6acb6c95e93cb462 100644 (file)
--- 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 d50d06f097fe4ddc739e0902445430cafa8a32da..ef2dda1ecd64e9e32f8164646a0d844960064739 100644 (file)
--- 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 c2cbdd6c8cc6fc45ea73f27c4dcea2fcdf7547f4..7f47755fa9fcd8a95c4020b7e79c8a90732aae8d 100644 (file)
--- 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 34fbea5214e1c3c99f5421bbe6e01570461b6bef..2037de6315e8f878e02a104193875cd8e6250100 100644 (file)
--- 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 433d0e9d07ebc649d7319cb9b4da6a492025f2da..435c59238b0f853a07aaea6f9a9d5199fd070142 100644 (file)
--- 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 698766055e234bdde2b978e460dc811d1b1dc879..9c160143e8eff721309004ea1a79ea7f2ba8c970 100644 (file)
--- 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 13191d550578fe6fea89a9c05aa8e6280243f225..002cdf64edf2be2c5fc9a2d91fa98e3b7262471a 100644 (file)
--- 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<mipmaps; i++)
+  for (i=0; i< (ssize_t) mipmaps; i++)
   {
     resize_image = ResizeImage(image,columns/2,rows/2,TriangleFilter,
       exception);