Reverted patches.

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index c14a891691d0b91a0274ef581adf0b1d1e63819a..13dd0d43011bfced3d718fdb80fa2c6030b652a8 100644 (file)
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -133,61 +133,6 @@ typedef struct _EdgeInfo
     bottom;
 } EdgeInfo;
 
-static void EdgeGeometry(const size_t width,const size_t height,
-  const GravityType gravity,RectangleInfo *region)
-{
-  if (region->height == 0)
-    region->height=height;
-  if (region->width == 0)
-    region->width=width;
-  switch (gravity)
-  {
-    case NorthEastGravity:
-    case EastGravity:
-    case SouthEastGravity:
-    {
-      region->x=(ssize_t) (width-region->width);
-      break;
-    }
-    case NorthGravity:
-    case SouthGravity:
-    case CenterGravity:
-    {
-      region->x+=(ssize_t) (width/2-region->width/2);
-      break;
-    }
-    case ForgetGravity:
-    case NorthWestGravity:
-    case WestGravity:
-    case SouthWestGravity:
-    default:
-      break;
-  }
-  switch (gravity)
-  {
-    case SouthWestGravity:
-    case SouthGravity:
-    case SouthEastGravity:
-    {
-      region->y=(ssize_t) (height-region->height);
-      break;
-    }
-    case EastGravity:
-    case WestGravity:
-    case CenterGravity:
-    {
-      region->y+=(ssize_t) (height/2-region->height/2);
-      break;
-    }
-    case ForgetGravity:
-    case NorthWestGravity:
-    case NorthGravity:
-    case NorthEastGravity:
-    default:
-      break;
-  }
-}
-
 static double GetEdgeBackgroundFactor(const Image *image,
   const CacheView *image_view,const GravityType gravity,const size_t width,
   const size_t height,const ssize_t x_offset,const ssize_t y_offset,
@@ -254,7 +199,7 @@ static double GetEdgeBackgroundFactor(const Image *image,
   edge_geometry.height=height;
   edge_geometry.x=x_offset;
   edge_geometry.y=y_offset;
-  EdgeGeometry(image->columns,image->rows,gravity,&edge_geometry);
+  GravityAdjustGeometry(image->columns,image->rows,gravity,&edge_geometry);
   edge_image=CropImage(image,&edge_geometry,exception);
   if (edge_image == (Image *) NULL)
     return(0.0);

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 5d22d572b6344cd8c4f67ab3cf71cbd100c9629f..d67b1b5031ae9882292bb00b6fd648a1062cbb87 100644 (file)
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -541,7 +541,7 @@ MagickExport void GravityAdjustGeometry(const size_t width,
     case EastGravity:
     case SouthEastGravity:
     {
-      region->x+=(ssize_t) (width-region->width);
+      region->x=(ssize_t) (width-region->width-region->x);
       break;
     }
     case NorthGravity:
@@ -564,7 +564,7 @@ MagickExport void GravityAdjustGeometry(const size_t width,
     case SouthGravity:
     case SouthEastGravity:
     {
-      region->y+=(ssize_t) (height-region->height);
+      region->y=(ssize_t) (height-region->height-region->y);
       break;
     }
     case EastGravity: