From d308873c0f329f9066f72b8282347c695c98728c Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 24 Jul 2019 19:31:55 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1647 --- MagickCore/draw.c | 11 +++++------ coders/svg.c | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 40d370b86..584e2250a 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -2721,7 +2721,7 @@ static MagickBooleanType RenderMVGContent(Image *image, DestroyImage(graphic_context[n]->clipping_mask); graphic_context[n]->clipping_mask=DrawClippingMask(image, graphic_context[n],token,clip_path,exception); - if (draw_info->compliance != SVGCompliance) + if (graphic_context[n]->compliance != SVGCompliance) { const char *clip_path; @@ -3111,7 +3111,7 @@ static MagickBooleanType RenderMVGContent(Image *image, DestroyImage(graphic_context[n]->composite_mask); graphic_context[n]->composite_mask=DrawCompositeMask(image, graphic_context[n],token,mask_path,exception); - if (draw_info->compliance != SVGCompliance) + if (graphic_context[n]->compliance != SVGCompliance) status=SetImageMask(image,CompositePixelMask, graphic_context[n]->composite_mask,exception); } @@ -3197,7 +3197,7 @@ static MagickBooleanType RenderMVGContent(Image *image, break; } if ((graphic_context[n]->clip_mask != (char *) NULL) && - (draw_info->compliance != SVGCompliance)) + (graphic_context[n]->compliance != SVGCompliance)) if (LocaleCompare(graphic_context[n]->clip_mask, graphic_context[n-1]->clip_mask) != 0) status=SetImageMask(image,WritePixelMask,(Image *) NULL, @@ -4290,11 +4290,10 @@ static MagickBooleanType RenderMVGContent(Image *image, primitive_info->point.x,primitive_info->point.y); clone_info->render=MagickFalse; clone_info->text=AcquireString(token); - (void) ConcatenateString(&clone_info->text," "); status&=GetTypeMetrics(image,clone_info,&metrics,exception); clone_info=DestroyDrawInfo(clone_info); cursor+=metrics.width; - if (draw_info->compliance != SVGCompliance) + if (graphic_context[n]->compliance != SVGCompliance) cursor=0.0; break; } @@ -4345,7 +4344,7 @@ static MagickBooleanType RenderMVGContent(Image *image, } if (graphic_context[n]->render != MagickFalse) { - if ((n != 0) && (draw_info->compliance != SVGCompliance) && + if ((n != 0) && (graphic_context[n]->compliance != SVGCompliance) && (graphic_context[n]->clip_mask != (char *) NULL) && (LocaleCompare(graphic_context[n]->clip_mask, graphic_context[n-1]->clip_mask) != 0)) diff --git a/coders/svg.c b/coders/svg.c index fb07f5ab6..0fe568c81 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -1616,7 +1616,6 @@ static void SVGStartElement(void *context,const xmlChar *name, char *text; - SVGStripString(MagickTrue,svg_info->text); text=EscapeString(svg_info->text,'\"'); (void) FormatLocaleFile(svg_info->file,"text %g,%g \"%s\"\n", svg_info->text_offset.x,svg_info->text_offset.y,text); -- 2.40.0