From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 13 Jan 2014 17:13:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2888
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66a58130399bc413ee71c91766c7706272a592fc;p=imagemagick

---

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index fc74479b1..b523b1829 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -1383,16 +1383,19 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x,
         {
           scale.x=MagickMax((size_t) floor(scale.x+0.5),1.0);
           scale.y=MagickMax((size_t) floor(scale.y+0.5),1.0);
-          if (scale.x > 1 && scale.y > 1 && scale.x * scale.y > geometry_info.rho)
+          if ((scale.x > 1.0) && (scale.y > 1.0) &&
+              ((scale.x*scale.y) > geometry_info.rho))
             {
               if (scale.x > scale.y)
                 {
-                  scale.x=(double) former_width/((double) former_height/--scale.y);
+                  scale.x=(double) former_width/((double) former_height/
+                    scale.y);
                   scale.x=MagickMax((size_t) floor(scale.x+0.5),1.0);
                 }
               else
                 {
-                  scale.y=(double) former_height/((double) former_width/--scale.x);
+                  scale.y=(double) former_height/((double) former_width/
+                    scale.x);
                   scale.y=MagickMax((size_t) floor(scale.y+0.5),1.0);
                 }
             }