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

Restore PointCloserThan() behaviour to really be "closer than". 

Change calls which really want it to be "closer than or equal" to
distance + 1.

Fixes: lp:1843329
* https://bugs.launchpad.net/kicad/+bug/1843329
This commit is contained in:
Jeff Young 2019-09-10 10:56:11 +01:00
parent 1a375a1e71
commit 25fa2131d2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/geometry/seg.cpp
View File

@ -40,9 +40,9 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
SEG::ecoord t = d.Dot( aP - A ); SEG::ecoord t = d.Dot( aP - A );
if( t <= 0 || !l_squared ) if( t <= 0 || !l_squared )
return ( aP - A ).SquaredEuclideanNorm() <= dist_sq; return ( aP - A ).SquaredEuclideanNorm() < dist_sq;
else if( t >= l_squared ) else if( t >= l_squared )
return ( aP - B ).SquaredEuclideanNorm() <= dist_sq; return ( aP - B ).SquaredEuclideanNorm() < dist_sq;
int dxdy = abs( d.x ) - abs( d.y ); int dxdy = abs( d.x ) - abs( d.y );

2
common/geometry/trigo.cpp
View File

@ -153,7 +153,7 @@ bool TestSegmentHit( const wxPoint &aRefPoint, wxPoint aStart, wxPoint aEnd, int
return std::abs( delta.y ) <= aDist; return std::abs( delta.y ) <= aDist;
SEG segment( aStart, aEnd ); SEG segment( aStart, aEnd );
return segment.PointCloserThan( aRefPoint, aDist ); return segment.PointCloserThan( aRefPoint, aDist + 1 );
} }