No commit message

ImageMagick · Nov 28, 2013 · 6398ec7 · 6398ec7
1 parent be2e0e0
commit 6398ec7
Show file tree

Hide file tree

Showing 79 changed files with 274 additions and 231 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -18,18 +18,17 @@
 #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"
 #include "MagickCore/random_.h"
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -18,20 +18,20 @@
 #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"
 #include "MagickCore/image-private.h"
 #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
@@ -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