haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cairo: fix incorrect handling of arcs with angle >= 360 deg in some cases. 

Fixes #9231
https://gitlab.com/kicad/code/kicad/issues/9231
This commit is contained in:
jean-pierre charras 2021-09-25 09:06:09 +02:00
parent c69a16ca6d
commit 5aea7b8123
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/gal/cairo/cairo_gal.cpp
View File

@ -140,6 +140,8 @@ const double CAIRO_GAL_BASE::angle_xform( const double aAngle )
void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double& aEndAngle ) void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double& aEndAngle )
{ {
// 360 deg arcs have a specific calculation.
bool is_360deg_arc = std::abs( aEndAngle - aStartAngle ) >= 2 * M_PI;
double startAngle = aStartAngle; double startAngle = aStartAngle;
double endAngle = aEndAngle; double endAngle = aEndAngle;
@ -163,7 +165,7 @@ void CAIRO_GAL_BASE::arc_angles_xform_and_normalize( double& aStartAngle, double
// So, if this is the case, force the aEndAngle value to draw a circle. // So, if this is the case, force the aEndAngle value to draw a circle.
aStartAngle = angle_xform( startAngle ); aStartAngle = angle_xform( startAngle );
if( std::abs( aEndAngle - aStartAngle ) >= 2 * M_PI ) // arc is a full circle if( is_360deg_arc ) // arc is a full circle
aEndAngle = aStartAngle + 2 * M_PI; aEndAngle = aStartAngle + 2 * M_PI;
else else
aEndAngle = angle_xform( endAngle ); aEndAngle = angle_xform( endAngle );