From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 18 Mar 2010 01:08:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9782
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=254181ba67e668add3e93a2aa96e389cdc4dd786;p=imagemagick

---

diff --git a/magick/display.c b/magick/display.c
index 61ac790da..139183745 100644
--- 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 29a353115..d39ccf69a 100644
--- 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 40f27b7b5..2e0a37636 100644
--- 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 eefadbb67..1ea9218a8 100644
--- 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)
     {