From 939d92bf2f053dfe13d8556cde0b86e90adbb48f Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 17 Jun 2015 11:14:12 +0000
Subject: [PATCH]

---
 MagickCore/accelerate.h      |  7 ++++---
 MagickCore/draw.h            | 12 ++++++------
 MagickCore/image.h           | 12 ++++++------
 MagickCore/monitor-private.h |  3 ++-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/MagickCore/accelerate.h b/MagickCore/accelerate.h
index 9b6f4c4e5..e2ddbdb70 100644
--- a/MagickCore/accelerate.h
+++ b/MagickCore/accelerate.h
@@ -30,10 +30,11 @@ extern "C" {
 
 extern MagickExport MagickBooleanType
   AccelerateCompositeImage(Image *,const ChannelType,const CompositeOperator,
-    const Image *,const ssize_t,const ssize_t,const float,const float,ExceptionInfo *),
+    const Image *,const ssize_t,const ssize_t,const float,const float,
+    ExceptionInfo *),
   AccelerateContrastImage(Image *,const MagickBooleanType,ExceptionInfo *),
-  AccelerateContrastStretchImageChannel(Image *, const ChannelType, const double, const double, 
-    ExceptionInfo*),
+  AccelerateContrastStretchImageChannel(Image *, const ChannelType,
+    const double,const double,ExceptionInfo*),
   AccelerateEqualizeImage(Image *,const ChannelType,ExceptionInfo *),
   AccelerateFunctionImage(Image *,const ChannelType,const MagickFunction,
     const size_t,const double *,ExceptionInfo *),
diff --git a/MagickCore/draw.h b/MagickCore/draw.h
index 5d9c600e9..ffdc7eb02 100644
--- a/MagickCore/draw.h
+++ b/MagickCore/draw.h
@@ -166,14 +166,14 @@ typedef struct _GradientInfo
   MagickBooleanType
     debug;
 
-  size_t
-    signature;
-
   PointInfo
     center;
 
   double
     radius;
+
+  size_t
+    signature;
 } GradientInfo;
 
 typedef struct _ElementReference
@@ -187,12 +187,12 @@ typedef struct _ElementReference
   GradientInfo
     gradient;
 
-  size_t
-    signature;
-
   struct _ElementReference
     *previous,
     *next;
+
+  size_t
+    signature;
 } ElementReference;
 
 typedef struct _DrawInfo
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 7b87a386c..d96dc9aaa 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -358,12 +358,12 @@ struct _Image
     signature;
 };
 
-/* ImageInfo structure
- * Stores an image list, as well as all global settings used by
- * all images held, -- unless overridden for that specific image.
- * See SyncImagesettings() which maps any global setting that always
- * overrides specific image settings.
- */
+/*
+  ImageInfo structure:
+    Stores an image list, as well as all global settings used by all images
+    held, -- unless overridden for that specific image.  See SyncImagesettings()
+    which maps any global setting that always overrides specific image settings.
+*/
 struct _ImageInfo
 {
   CompressionType
diff --git a/MagickCore/monitor-private.h b/MagickCore/monitor-private.h
index e6560235b..601b8f563 100644
--- a/MagickCore/monitor-private.h
+++ b/MagickCore/monitor-private.h
@@ -32,7 +32,8 @@ static inline MagickBooleanType SetImageProgress(const Image *image,
 
   if (image->progress_monitor == (MagickProgressMonitor) NULL)
     return(MagickTrue);
-  (void) FormatLocaleString(message,MagickPathExtent,"%s/%s",tag,image->filename);
+  (void) FormatLocaleString(message,MagickPathExtent,"%s/%s",tag,
+    image->filename);
   return(image->progress_monitor(message,offset,extent,image->client_data));
 }
 
-- 
2.40.0