From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 15 Aug 2017 16:12:28 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/646
X-Git-Tag: 7.0.6-8~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e3758d3caf5e10e752f04f310ece9531171772f;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/646
---

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index e7f312849..12a5695f7 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4727,15 +4727,10 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             (fabs(primitive_info[i-1].point.y-primitive_info[0].point.y) < DrawEpsilon) ?
             MagickTrue : MagickFalse;
           i=(ssize_t) primitive_info[0].coordinates;
-          if (((closed_path != MagickFalse) &&
-              (draw_info->linejoin == RoundJoin)) ||
-              (primitive_info[i].primitive != UndefinedPrimitive))
-            {
-              (void) DrawPolygonPrimitive(image,draw_info,primitive_info,
-                exception);
-              break;
-            }
-          if (draw_info->linecap == RoundCap)
+          if ((((draw_info->linecap == RoundCap) ||
+                (closed_path != MagickFalse)) &&
+               (draw_info->linejoin == RoundJoin)) ||
+               (primitive_info[i].primitive != UndefinedPrimitive))
             {
               (void) DrawPolygonPrimitive(image,draw_info,primitive_info,
                 exception);
diff --git a/configure b/configure
index f490838c3..999c83df2 100755
--- a/configure
+++ b/configure
@@ -4530,7 +4530,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.6-8
 
-MAGICK_GIT_REVISION=20800:0167407f5:20170812
+MAGICK_GIT_REVISION=20819:6e663f7e3:20170815
 
 
 # Substitute library versioning