(no commit message)

diff --git a/magick/display.c b/magick/display.c
index 61ac790dac50be2e71fc97ca529e7bb1c1e27748..139183745ca8902d5beef8e58f15576579e21fb2 100644 (file)
--- a/magick/display.c
+++ b/magick/display.c
@@ -8517,7 +8517,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       if ((flags & PsiValue) == 0)
         geometry_info.psi=0.1*(*image)->rows;
       vignette_image=VignetteImage(*image,geometry_info.rho,geometry_info.sigma,
-        (long) floor(geometry_info.xi+0.5),(long) floor(geometry_info.psi+0.5),
+        (long) ceil(geometry_info.xi-0.5),(long) ceil(geometry_info.psi-0.5),
         &(*image)->exception);
       if (vignette_image != (Image *) NULL)
         {

diff --git a/magick/draw.c b/magick/draw.c
index 29a3531154651e174f1a5459f0545b17fb81ab2f..d39ccf69af3a5ed5b676e92da09fa2efc4c40516 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -4951,7 +4951,7 @@ static void TraceArcPath(PrimitiveInfo *primitive_info,const PointInfo start,
     if ((theta > 0.0) && (sweep == MagickFalse))
       theta-=(MagickRealType) (2.0*MagickPI);
   arc_segments=(unsigned long) ceil(fabs((double) (theta/(0.5*MagickPI+
-    MagickEpsilon))));
+    MagickEpsilon)))-0.5);
   p=primitive_info;
   for (i=0; i < (long) arc_segments; i++)
   {

diff --git a/magick/fx.c b/magick/fx.c
index 40f27b7b5d0c012307ec8be99e6f1dcc4d59889f..2e0a3763609b9a0e204a9a7aeff171a9eca7f870 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -3273,8 +3273,8 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       */
       depth--;
       attenuate++;
-      x_mid=(long) ceil(segment->x1+segment->x2-0.5)/2;
-      y_mid=(long) ceil(segment->y1+segment->y2-0.5)/2;
+      x_mid=(long) ceil((segment->x1+segment->x2)/2-0.5);
+      y_mid=(long) ceil((segment->y1+segment->y2)/2-0.5);
       local_info=(*segment);
       local_info.x2=(double) x_mid;
       local_info.y2=(double) y_mid;
@@ -3294,8 +3294,8 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
     }
   if (SetImageStorageClass(image,DirectClass) == MagickFalse)
     return(MagickFalse);
-  x_mid=(long) ceil(segment->x1+segment->x2-0.5)/2;
-  y_mid=(long) ceil(segment->y1+segment->y2-0.5)/2;
+  x_mid=(long) ceil((segment->x1+segment->x2)/2-0.5);
+  y_mid=(long) ceil((segment->y1+segment->y2)/2-0.5);
   if ((segment->x1 == (double) x_mid) && (segment->x2 == (double) x_mid) &&
       (segment->y1 == (double) y_mid) && (segment->y2 == (double) y_mid))
     return(MagickFalse);

diff --git a/magick/geometry.c b/magick/geometry.c
index eefadbb675dde42759620b9914d23157716a4b5a..1ea9218a8e397bc81a88bb5188ef947e36097da5 100644 (file)
--- a/magick/geometry.c
+++ b/magick/geometry.c
@@ -1179,8 +1179,10 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,long *x,
                 scale_factor=(MagickRealType) *height/(MagickRealType)
                   former_width;
             }
-      *width=MagickMax((unsigned long) floor(scale_factor*former_width+0.5),1UL);
-      *height=MagickMax((unsigned long) floor(scale_factor*former_height+0.5),1UL);
+      *width=MagickMax((unsigned long) floor(scale_factor*former_width+0.5),
+        1UL);
+      *height=MagickMax((unsigned long) floor(scale_factor*former_height+0.5),
+        1UL);
     }
   if ((flags & GreaterValue) != 0)
     {