Update web pages

[imagemagick] / MagickCore / draw.h

diff --git a/MagickCore/draw.h b/MagickCore/draw.h
index f995aadf29131dd0c09346792bc0ca9f6cc4e79b..ffdc7eb020e8ee2ddda44667a897f01614b90c57 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-2015 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,
@@ -103,21 +103,21 @@ typedef enum
 typedef enum
 {
   UndefinedPrimitive,
-  PointPrimitive,
-  LinePrimitive,
-  RectanglePrimitive,
-  RoundRectanglePrimitive,
+  AlphaPrimitive,
   ArcPrimitive,
-  EllipsePrimitive,
-  CirclePrimitive,
-  PolylinePrimitive,
-  PolygonPrimitive,
   BezierPrimitive,
+  CirclePrimitive,
   ColorPrimitive,
-  MattePrimitive,
-  TextPrimitive,
+  EllipsePrimitive,
   ImagePrimitive,
-  PathPrimitive
+  LinePrimitive,
+  PathPrimitive,
+  PointPrimitive,
+  PolygonPrimitive,
+  PolylinePrimitive,
+  RectanglePrimitive,
+  RoundRectanglePrimitive,
+  TextPrimitive
 } PrimitiveType;
 
 typedef enum
@@ -139,7 +139,7 @@ typedef struct _StopInfo
   PixelInfo
     color;
 
-  MagickRealType
+  double
     offset;
 } StopInfo;
 
@@ -166,14 +166,14 @@ typedef struct _GradientInfo
   MagickBooleanType
     debug;
 
-  size_t
-    signature;
-
   PointInfo
     center;
 
-  MagickRealType
+  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
@@ -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;
@@ -318,13 +314,13 @@ typedef struct _DrawInfo
     direction;
 
   MagickBooleanType
-
     debug;
 
   size_t
     signature;
 } DrawInfo;
 
+
 typedef struct _PrimitiveInfo
 {
   PointInfo