]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Sun, 27 May 2018 22:37:14 +0000 (18:37 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 27 May 2018 22:37:14 +0000 (18:37 -0400)
MagickCore/draw.c

index 4760f9767cfde0fa840faefebd5247ca346310f0..acc9513cb41dc6c5e28b9af04d58048745396f44 100644 (file)
@@ -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;