]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/646
authorCristy <urban-warrior@imagemagick.org>
Tue, 15 Aug 2017 16:12:28 +0000 (12:12 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 15 Aug 2017 16:12:28 +0000 (12:12 -0400)
MagickCore/draw.c
configure

index e7f312849f3a0243e13dc7a2d12bcd958b8397c0..12a5695f78ca3c1eb9946ffa3222bc32997b98c4 100644 (file)
@@ -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);
index f490838c3354d274802253cadae8c1d2cb7eae80..999c83df26b9b4ebf634081e476fb837ee34e406 100755 (executable)
--- 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