commit 64ad8f928c50680fcbd1aa3b433deae984348f89
author cristy <urban-warrior@git.imagemagick.org> Fri Aug 03 00:58:24 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Aug 03 00:58:24 2012 +0000
tree a3bf124e0a8aed930642a62d5962c7375a3a1276
parent 5b93af12a2e31020417658076e361d0a52e744ee

MagickCore/geometry.c

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 2484311..6d7fa07 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -286,18 +286,15 @@
             *y=(-*y);
         }
     }
-  if ((flags & SeparatorValue) == 0)
+  if ((flags & PercentValue) != 0)
     {
-      if (((flags & PercentValue) != 0) && ((flags & WidthValue) == 0))
-        {
-          *width=(*height);
-          flags|=WidthValue;
-        }
-      if (((flags & PercentValue) != 0) && ((flags & HeightValue) == 0))
+      if (((flags & SeparatorValue) == 0) && ((flags & HeightValue) == 0))
         {
           *height=(*width);
           flags|=HeightValue;
         }
+      if (((flags & SeparatorValue) != 0) && ((flags & WidthValue) == 0))
+        *width=(*height);
     }
 #if 0
   /* Debugging Geometry */
@@ -1072,18 +1069,15 @@
       flags|=SigmaValue;
       flags&=(~XiValue);
     }
-  if ((flags & SeparatorValue) == 0)
+  if ((flags & PercentValue) != 0)
     {
-      if (((flags & PercentValue) != 0) && ((flags & RhoValue) == 0))
-        {
-          geometry_info->rho=geometry_info->sigma;
-          flags|=RhoValue;
-        }
-      if (((flags & PercentValue) != 0) && ((flags & SigmaValue) == 0))
+      if (((flags & SeparatorValue) == 0) && ((flags & SigmaValue) == 0))
         {
           geometry_info->sigma=geometry_info->rho;
           flags|=SigmaValue;
         }
+      if (((flags & SeparatorValue) != 0) && ((flags & RhoValue) == 0))
+        geometry_info->rho=geometry_info->sigma;
     }
 #if 0
   /* Debugging Geometry */
@@ -1457,6 +1451,13 @@
     }
   flags=ParseMetaGeometry(geometry,&region_info->x,&region_info->y,
     &region_info->width,&region_info->height);
+  if ((flags & PercentValue) != 0)
+    {
+      if ((flags & WidthValue) == 0)
+        region_info->width=region_info->height;
+      if ((flags & HeightValue) == 0)
+        region_info->height=region_info->width;
+    }
   return(flags);
 }