From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 24 Nov 2016 19:57:00 +0000 (-0500)
Subject: Render to clip mask rather than image for clip-path MVG graphics primitive
X-Git-Tag: 7.0.3-8~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b81b01d61266f5830d1b54b90cf7ef37e12c8e5a;p=imagemagick

Render to clip mask rather than image for clip-path MVG graphics primitive
---

diff --git a/ChangeLog b/ChangeLog
index c215faf83..bb7fcd457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
   * Permit EPT images with just a TIFF or EPS image, not both (reference
     https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30921).
   * The -clone option no longer leaks memory.
+  * Render to clip mask rather than image for clip-path MVG graphics primitive.
 
 2016-11-15  7.0.3-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.3-7, GIT revision 19024:87aca83:20161115.
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 0026eb375..2f05009f7 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1434,9 +1434,9 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
     exception);
   clone_info->clip_mask=(char *) NULL;
   status=NegateImage(clip_mask,MagickFalse,exception);
+  status&=DrawImage(clip_mask,clone_info,exception);
   (void) SetImageMask(image,ReadPixelMask,clip_mask,exception);
   clip_mask=DestroyImage(clip_mask);
-  status&=DrawImage(image,clone_info,exception);
   clone_info=DestroyDrawInfo(clone_info);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),"end clip-path");