From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 28 Aug 2017 12:30:00 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.7-0~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22ebb41fffc1a28e5f070a03a28514c561d6862e;p=imagemagick

...
---

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index aaa899a06..3b308327a 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -2051,9 +2051,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
           {
             GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
-            graphic_context[n]->fill.alpha=QuantumRange-ClampToQuantum(
-              (MagickRealType) QuantumRange*(1.0-factor*StringToDouble(token,
-              &next_token)));
+            graphic_context[n]->fill.alpha=(MagickRealType) (QuantumRange-
+              ClampToQuantum((MagickRealType) QuantumRange*(1.0-factor*
+              StringToDouble(token,&next_token))));
             if (token == next_token)
               status=MagickFalse;
             break;
@@ -2233,9 +2233,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
           {
             GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
-            graphic_context[n]->alpha=QuantumRange*(1.0-(QuantumScale*
-              graphic_context[n]->alpha*(1.0-factor*StringToDouble(token,
-              &next_token))));
+            graphic_context[n]->alpha=(Quantum) (QuantumRange*(1.0-
+              (QuantumScale*graphic_context[n]->alpha*(1.0-factor*
+              StringToDouble(token,&next_token)))));
             graphic_context[n]->fill_alpha=QuantumRange*(1.0-(QuantumScale*
               graphic_context[n]->fill_alpha*(1.0-factor*StringToDouble(token,
               &next_token))));
@@ -2721,9 +2721,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
           {
             GetNextToken(q,&q,extent,token);
             factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
-            graphic_context[n]->stroke.alpha=QuantumRange-ClampToQuantum(
-              (MagickRealType) QuantumRange*(1.0-factor*StringToDouble(token,
-              &next_token)));
+            graphic_context[n]->stroke.alpha=(MagickRealType) (QuantumRange-
+              ClampToQuantum((MagickRealType) QuantumRange*(1.0-factor*
+              StringToDouble(token,&next_token))));
             if (token == next_token)
               status=MagickFalse;
             break;
@@ -2953,7 +2953,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
     /*
       Speculate how many points our primitive might consume.
     */
-    points_extent=primitive_info[j].coordinates;
+    points_extent=(double) primitive_info[j].coordinates;
     switch (primitive_type)
     {
       case RectanglePrimitive:
@@ -2980,7 +2980,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
         if (primitive_info[j].coordinates > 107)
           (void) ThrowMagickException(exception,GetMagickModule(),DrawError,
             "TooManyBezierCoordinates","`%s'",token);
-        points_extent=BezierQuantum*primitive_info[j].coordinates;
+        points_extent=(double) (BezierQuantum*primitive_info[j].coordinates);
         break;
       }
       case PathPrimitive:
@@ -3027,13 +3027,13 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
       default:
         break;
     }
-    if (((size_t) points_extent) < points_extent)
+    if (((double) ((size_t) points_extent)) < points_extent)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
           ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
         break;
       }
-    if ((i+points_extent) >= number_points)
+    if (((MagickSizeType) (i+points_extent)) >= number_points)
       {
         /*
           Resize based on speculative points required by primitive.
diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 26115ecb5..b01364e8e 100644
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -44,7 +44,7 @@ require AutoLoader;
       ConfigureError FatalErrorException
     );
 
-$VERSION = '7.06';
+$VERSION = '7.07';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm
index fdc31683d..08341c81a 100644
--- a/PerlMagick/quantum/quantum.pm
+++ b/PerlMagick/quantum/quantum.pm
@@ -43,7 +43,7 @@ require AutoLoader;
       ConfigureError FatalErrorException
     );
 
-$VERSION = '7.06';
+$VERSION = '7.07';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()