From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 30 May 2018 20:21:33 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.7-38~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98948b1ec56d24692372dfe93b4a42a8bf6fcf8d;p=imagemagick

...
---

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index bfb1e7932..f6433e619 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -417,8 +417,17 @@ extern "C" {
 
 static int CompareEdges(const void *p_edge,const void *q_edge)
 {
-  double
-    delta;
+#define DrawCompareEdge(p,q) \
+{ \
+  double \
+    delta; \
+ \
+  delta=(p)-(q); \
+  if (delta < 0.0) \
+    return(-1); \
+  if (delta > 0.0) \
+    return(1); \
+}
 
   register const PointInfo
     *p,
@@ -429,41 +438,12 @@ static int CompareEdges(const void *p_edge,const void *q_edge)
   */
   p=((const EdgeInfo *) p_edge)->points;
   q=((const EdgeInfo *) q_edge)->points;
-  delta=p[0].y-q[0].y;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=p[0].x-q[0].x;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=(p[1].x-p[0].x)*(q[1].y-q[0].y)-(p[1].y-p[0].y)*(q[1].x-q[0].x);
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=p[0].y-q[0].y;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=p[0].x-q[0].x;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=p[1].y-q[1].y;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
-  delta=p[1].x-q[1].x;
-  if (delta < 0.0)
-    return(-1);
-  if (delta > 0.0)
-    return(1);
+  DrawCompareEdge(p[0].y,q[0].y);
+  DrawCompareEdge(p[0].x,q[0].x);
+  DrawCompareEdge((p[1].x-p[0].x)*(q[1].y-q[0].y),(p[1].y-p[0].y)*
+    (q[1].x-q[0].x));
+  DrawCompareEdge(p[1].y,q[1].y);
+  DrawCompareEdge(p[1].x,q[1].x);
   return(0);
 }