(no commit message)

[imagemagick] / MagickCore / draw.h

diff --git a/MagickCore/draw.h b/MagickCore/draw.h
index e331327b2511d09650f032237ad2c3f5f853ea3f..0fc675f9164812a61df900f58a11a2d1e4a40e60 100644 (file)
--- a/MagickCore/draw.h
+++ b/MagickCore/draw.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  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.
@@ -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,
@@ -139,7 +139,7 @@ typedef struct _StopInfo
   PixelInfo
     color;
 
-  MagickRealType
+  double
     offset;
 } StopInfo;
 
@@ -172,7 +172,7 @@ typedef struct _GradientInfo
   PointInfo
     center;
 
-  MagickRealType
+  double
     radius;
 } GradientInfo;
 
@@ -207,12 +207,15 @@ typedef struct _DrawInfo
   AffineMatrix
     affine;
 
-  GravityType
-    gravity;
-
   PixelInfo
     fill,
-    stroke;
+    stroke,
+    undercolor,
+    border_color;
+
+  Image
+    *fill_pattern,
+    *stroke_pattern;
 
   double
     stroke_width;
@@ -220,10 +223,6 @@ typedef struct _DrawInfo
   GradientInfo
     gradient;
 
-  Image
-    *fill_pattern,
-    *stroke_pattern;
-
   MagickBooleanType
     stroke_antialias,
     text_antialias;
@@ -250,16 +249,14 @@ typedef struct _DrawInfo
     compose;
 
   char
-    *text;
-
-  size_t
-    face;
-
-  char
+    *text,
     *font,
     *metrics,
     *family;
 
+  size_t
+    face;
+
   StyleType
     style;
 
@@ -281,9 +278,8 @@ typedef struct _DrawInfo
   AlignType
     align;
 
-  PixelInfo
-    undercolor,
-    border_color;
+  GravityType
+    gravity;
 
   char
     *server_name;
@@ -309,12 +305,6 @@ typedef struct _DrawInfo
   ElementReference
     element_reference;
 
-  MagickBooleanType
-    debug;
-
-  size_t
-    signature;
-
   double
     kerning,
     interword_spacing,
@@ -322,8 +312,15 @@ typedef struct _DrawInfo
 
   DirectionType
     direction;
+
+  MagickBooleanType
+    debug;
+
+  size_t
+    signature;
 } DrawInfo;
 
+
 typedef struct _PrimitiveInfo
 {
   PointInfo