(no commit message)

[imagemagick] / MagickCore / geometry.h

diff --git a/MagickCore/geometry.h b/MagickCore/geometry.h
index 9fa8f3b4bbc0634c9f589dab458b660e2c457a50..2375600509a011b5f6344a2cd86b0de57a62ff2c 100644 (file)
--- a/MagickCore/geometry.h
+++ b/MagickCore/geometry.h
@@ -1,12 +1,12 @@
 /*
-  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.
   obtain a copy of the License at
-  
+
     http://www.imagemagick.org/script/license.php
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,6 +55,7 @@ typedef enum
   CorrelateNormalizeValue = 0x10000, /* '^' see ScaleKernelValue() */
   AreaValue = 0x20000,     /* '@'  resize to area - special use flag */
   DecimalValue = 0x40000,  /* '.'  floating point numbers found */
+  SeparatorValue = 0x80000,  /* 'x'  separator found  */
 #undef AllValues
   AllValues = 0x7fffffff
 } GeometryFlags;
@@ -70,7 +71,6 @@ typedef enum
 #undef SouthWestGravity
 #undef SouthGravity
 #undef SouthEastGravity
-#undef StaticGravity
 #endif
 
 typedef enum
@@ -80,13 +80,12 @@ typedef enum
   NorthWestGravity = 1,
   NorthGravity = 2,
   NorthEastGravity = 3,
-  WestGravity = 4, 
+  WestGravity = 4,
   CenterGravity = 5,
   EastGravity = 6,
   SouthWestGravity = 7,
   SouthGravity = 8,
   SouthEastGravity = 9,
-  StaticGravity = 10 
 } GravityType;
 
 typedef struct _AffineMatrix
@@ -117,6 +116,13 @@ typedef struct _OffsetInfo
     y;
 } OffsetInfo;
 
+typedef struct _PointInfo
+{
+  double
+    x,
+    y;
+} PointInfo;
+
 typedef struct _RectangleInfo
 {
   size_t