From 1697f5e06a87d52714354c783cebf63a8836a949 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 5 Apr 2018 19:08:48 -0400 Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7402 --- MagickCore/draw.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index a334e9b08..e0546c452 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -91,7 +91,6 @@ */ #define BezierQuantum 200 #define DrawEpsilon (1.0e-10) -#define EllipseEpsilon (0.0001) #define ThrowPointExpectedException(token,exception) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),DrawError, \ @@ -1677,9 +1676,6 @@ static size_t GetEllipseCoordinates(const PointInfo start,const PointInfo stop, PointInfo angle; - size_t - coordinates; - /* Ellipses are just short segmented polys. */ @@ -1687,16 +1683,12 @@ static size_t GetEllipseCoordinates(const PointInfo start,const PointInfo stop, step=MagickPI/8.0; if ((delta >= 0.0) && (delta < (MagickPI/8.0))) step=MagickPI/(4.0*(MagickPI*PerceptibleReciprocal(delta)/2.0)); - if (step < EllipseEpsilon) - step=EllipseEpsilon; angle.x=DegreesToRadians(degrees.x); y=degrees.y; while (y < degrees.x) y+=360.0; angle.y=DegreesToRadians(y); - for (coordinates=0; angle.x < angle.y; angle.x+=step) - coordinates++; - return(coordinates+1); + return((size_t) floor((angle.y-angle.x)/step+0.5)+2); } static size_t GetRoundRectangleCoordinates(const PointInfo start, @@ -5549,8 +5541,6 @@ static void TraceEllipse(PrimitiveInfo *primitive_info,const PointInfo start, step=MagickPI/8.0; if ((delta >= 0.0) && (delta < (MagickPI/8.0))) step=MagickPI/(4.0*(MagickPI*PerceptibleReciprocal(delta)/2.0)); - if (step < EllipseEpsilon) - step=EllipseEpsilon; angle.x=DegreesToRadians(degrees.x); y=degrees.y; while (y < degrees.x) -- 2.40.0