]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <mikayla-grace@urban-warrior.org>
Wed, 27 Feb 2019 21:16:58 +0000 (16:16 -0500)
committerCristy <mikayla-grace@urban-warrior.org>
Wed, 27 Feb 2019 21:16:58 +0000 (16:16 -0500)
MagickCore/attribute.c

index c3c0fffc7480eec1b52e83b06fe17c022cded589..3d837f948c858d88b2aa421e1c5183319b1ea413 100644 (file)
@@ -134,7 +134,8 @@ typedef struct _EdgeInfo
 } EdgeInfo;
 
 static RectangleInfo EdgeGravityGeometry(const Image *image,
-  const GravityType gravity,const char *geometry)
+  const GravityType gravity,const size_t width,const size_t height,
+  const ssize_t x,const ssize_t y)
 {
   RectangleInfo
     edge_info,
@@ -143,8 +144,10 @@ static RectangleInfo EdgeGravityGeometry(const Image *image,
   /*
     Adjust geometry according to gravity setting.
   */
-  SetGeometry(image,&edge_info);
-  (void) ParseAbsoluteGeometry(geometry,&edge_info);
+  edge_info.width=width;
+  edge_info.height=height;
+  edge_info.x=x;
+  edge_info.y=y;
   gravity_info=edge_info;
   GravityAdjustGeometry(image->columns,image->rows,gravity,&gravity_info);
   edge_info.x=gravity_info.x;
@@ -159,9 +162,6 @@ static double GetEdgeBlendFactor(const Image *image,const CacheView *image_view,
   CacheView
     *edge_view;
 
-  char
-    geometry[MagickPathExtent];
-
   double
     factor;
 
@@ -216,9 +216,8 @@ static double GetEdgeBlendFactor(const Image *image,const CacheView *image_view,
     }
   }
   GetPixelInfoPixel(image,p,&background);
-  (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g%+g%+g",(double)
-    width,(double) height,(double) x_offset,(double) y_offset);
-  edge_geometry=EdgeGravityGeometry(image,gravity,geometry);
+  edge_geometry=EdgeGravityGeometry(image,gravity,width,height,x_offset,
+    y_offset);
   edge_image=CropImage(image,&edge_geometry,exception);
   if (edge_image == (Image *) NULL)
     return(0.0);