From: Cristy Date: Sun, 27 May 2018 22:37:14 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.7-36~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e55afc317d81210c44b5c725b827ded8b91f1a44;p=imagemagick ... --- diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 4760f9767..acc9513cb 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -2606,7 +2606,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, /* Inject class elements in stream. */ - offset=p-primitive; + offset=(ssize_t) (p-primitive); elements=AcquireString(primitive); elements[offset]='\0'; (void) ConcatenateString(&elements,node); @@ -3036,14 +3036,10 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, StringToDouble(token,&next_token),0.0),1.0); if (token == next_token) ThrowPointExpectedException(token,exception); - if (fabs(opacity) >= DrawEpsilon) - { - graphic_context[n]->fill_alpha*=opacity; - graphic_context[n]->fill.alpha=graphic_context[n]->fill_alpha; - graphic_context[n]->stroke_alpha*=opacity; - graphic_context[n]->stroke.alpha= - graphic_context[n]->stroke_alpha; - } + graphic_context[n]->fill_alpha*=opacity; + graphic_context[n]->fill.alpha=graphic_context[n]->fill_alpha; + graphic_context[n]->stroke_alpha*=opacity; + graphic_context[n]->stroke.alpha=graphic_context[n]->stroke_alpha; break; } status=MagickFalse;