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

Cairo: Treat no stroke as an even line width 

Also protect against 180° angle issues in arcs
This commit is contained in:
Seth Hillbrand 2019-02-18 18:00:38 -08:00
parent 467d37e3f0
commit 7d1a5c425c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ static double roundp( double x )
const VECTOR2D CAIRO_GAL_BASE::roundp( const VECTOR2D& v ) const VECTOR2D CAIRO_GAL_BASE::roundp( const VECTOR2D& v )
{ {
if( lineWidthIsOdd ) if( lineWidthIsOdd && isStrokeEnabled )
return VECTOR2D( ::roundp( v.x ), ::roundp( v.y ) ); return VECTOR2D( ::roundp( v.x ), ::roundp( v.y ) );
else else
return VECTOR2D( floor( v.x + 0.5 ), floor( v.y + 0.5 ) ); return VECTOR2D( floor( v.x + 0.5 ), floor( v.y + 0.5 ) );
@ -275,9 +275,10 @@ void CAIRO_GAL_BASE::DrawArc( const VECTOR2D& aCenterPoint, double aRadius, doub
auto chord = endPointS - startPointS; auto chord = endPointS - startPointS;
double c = chord.EuclideanNorm() / 2.0; double c = chord.EuclideanNorm() / 2.0;
auto d = chord.Rotate( M_PI / 2.0 ).Resize( c ); auto d = chord.Rotate( M_PI / 2.0 ).Resize( c );
auto tan_angle = tan( centerAngle / 2.0 );
if( centerAngle != 0.0 ) if( tan_angle != 0.0 )
mid += d * ( 1.0 / tan( centerAngle / 2.0 ) ); mid += d * ( 1.0 / tan_angle );
auto rS = ( mid - startPointS ).EuclideanNorm(); auto rS = ( mid - startPointS ).EuclideanNorm();