(no commit message)

[imagemagick] / MagickCore / draw.h

diff --git a/MagickCore/draw.h b/MagickCore/draw.h
index cb16cec2470deac06caa6451336dd8847d1c7278..4100dde49eea891ec7e9e796d2a675243cfa47e4 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-2012 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.
@@ -134,19 +134,12 @@ typedef enum
   RepeatSpread
 } SpreadMethod;
 
-typedef struct _PointInfo
-{ 
-  double
-    x,
-    y;
-} PointInfo;
-
 typedef struct _StopInfo
 {
   PixelInfo
     color;
 
-  MagickRealType
+  double
     offset;
 } StopInfo;
 
@@ -179,7 +172,7 @@ typedef struct _GradientInfo
   PointInfo
     center;
 
-  MagickRealType
+  double
     radius;
 } GradientInfo;
 
@@ -214,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;
@@ -227,10 +223,6 @@ typedef struct _DrawInfo
   GradientInfo
     gradient;
 
-  Image
-    *fill_pattern,
-    *stroke_pattern;
-
   MagickBooleanType
     stroke_antialias,
     text_antialias;
@@ -257,16 +249,14 @@ typedef struct _DrawInfo
     compose;
 
   char
-    *text;
-
-  size_t
-    face;
-
-  char
+    *text,
     *font,
     *metrics,
     *family;
 
+  size_t
+    face;
+
   StyleType
     style;
 
@@ -288,9 +278,8 @@ typedef struct _DrawInfo
   AlignType
     align;
 
-  PixelInfo
-    undercolor,
-    border_color;
+  GravityType
+    gravity;
 
   char
     *server_name;
@@ -316,12 +305,6 @@ typedef struct _DrawInfo
   ElementReference
     element_reference;
 
-  MagickBooleanType
-    debug;
-
-  size_t
-    signature;
-
   double
     kerning,
     interword_spacing,
@@ -329,8 +312,15 @@ typedef struct _DrawInfo
 
   DirectionType
     direction;
+
+  MagickBooleanType
+    debug;
+
+  size_t
+    signature;
 } DrawInfo;
 
+
 typedef struct _PrimitiveInfo
 {
   PointInfo