sanity check for affine when drawing

Author: Cristy

magick/draw.c

@@ -1328,13 +1328,6 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
 %
 */
 
-static inline double SaneStrokeWidth(const Image *image,
-  const DrawInfo *draw_info)
-{
-  return(MagickMin((double) draw_info->stroke_width,
-    (2.0*sqrt(2.0)+MagickEpsilon)*MagickMax(image->columns,image->rows)));
-}
-
 static MagickBooleanType DrawBoundingRectangles(Image *image,
   const DrawInfo *draw_info,const PolygonInfo *polygon_info)
 {
@@ -1389,7 +1382,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
         resolution.y=resolution.x;
     }
   mid=(resolution.x/96.0)*ExpandAffine(&clone_info->affine)*
-    SaneStrokeWidth(image,clone_info)/2.0;
+    clone_info->stroke_width/2.0;
   bounds.x1=0.0;
   bounds.y1=0.0;
   bounds.x2=0.0;
@@ -4367,6 +4360,12 @@ static MagickBooleanType RenderMVGContent(Image *image,
             status&=DrawClipPath(image,graphic_context[n],
               graphic_context[n]->clip_mask);
           }
+        /*
+          One last sanity check before we draw.
+        */
+        status&=CheckPrimitiveExtent(&mvg_info,
+          ExpandAffine(&graphic_context[n]->affine));
+        status&=CheckPrimitiveExtent(&mvg_info,draw_info->stroke_width);
         status&=DrawPrimitive(image,graphic_context[n],primitive_info);
       }
     proceed=SetImageProgress(image,RenderImageTag,q-primitive,(MagickSizeType)
@@ -4807,7 +4806,7 @@ RestoreMSCWarning
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),"    begin draw-polygon");
   fill=(primitive_info->method == FillToBorderMethod) ||
     (primitive_info->method == FloodfillMethod) ? MagickTrue : MagickFalse;
-  mid=ExpandAffine(&draw_info->affine)*SaneStrokeWidth(image,draw_info)/2.0;
+  mid=ExpandAffine(&draw_info->affine)*draw_info->stroke_width/2.0;
   bounds=polygon_info[0]->edges[0].bounds;
   for (i=1; i < (ssize_t) polygon_info[0]->number_edges; i++)
   {
@@ -5514,7 +5513,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             status&=DrawDashPolygon(draw_info,primitive_info,image);
           break;
         }
-      mid=ExpandAffine(&draw_info->affine)*SaneStrokeWidth(image,draw_info)/2.0;
+      mid=ExpandAffine(&draw_info->affine)*draw_info->stroke_width/2.0;
       if ((mid > 1.0) &&
           ((draw_info->stroke.opacity != (Quantum) TransparentOpacity) ||
            (draw_info->stroke_pattern != (Image *) NULL)))
@@ -7184,7 +7183,7 @@ static PrimitiveInfo *TraceStrokePolygon(const Image *image,
         slope.p=dy.p/dx.p;
         inverse_slope.p=(-1.0/slope.p);
       }
-  mid=ExpandAffine(&draw_info->affine)*SaneStrokeWidth(image,draw_info)/2.0;
+  mid=ExpandAffine(&draw_info->affine)*draw_info->stroke_width/2.0;
   miterlimit=(double) (draw_info->miterlimit*draw_info->miterlimit*mid*mid);
   if ((draw_info->linecap == SquareCap) && (closed_path == MagickFalse))
     (void) TraceSquareLinecap(polygon_primitive,number_vertices,mid);