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

libs/kimath: fix divide by 0 for 0-length segments

This commit is contained in:
Tomasz Wlostowski 2022-10-05 22:40:31 +02:00
parent 6e0d940b98
commit 26b2fd36d4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/kimath/src/geometry/seg.cpp
View File

@ -364,6 +364,9 @@ bool SEG::mutualDistance( const SEG& aSeg, ecoord& aD1, ecoord& aD2 ) const
ecoord l = p * p + q * q; ecoord l = p * p + q * q;
if( l == 0 )
return false;
ecoord det1 = p * b.A.x + q * b.A.y + r; ecoord det1 = p * b.A.x + q * b.A.y + r;
ecoord det2 = p * b.B.x + q * b.B.y + r; ecoord det2 = p * b.B.x + q * b.B.y + r;
@ -380,7 +383,8 @@ bool SEG::ApproxCollinear( const SEG& aSeg, int aDistanceThreshold ) const
{ {
ecoord d1, d2; ecoord d1, d2;
mutualDistance( aSeg, d1, d2 ); if( ! mutualDistance( aSeg, d1, d2 ) )
return false;
return std::abs( d1 ) <= aDistanceThreshold && std::abs( d2 ) <= aDistanceThreshold; return std::abs( d1 ) <= aDistanceThreshold && std::abs( d2 ) <= aDistanceThreshold;
} }
@ -390,7 +394,8 @@ bool SEG::ApproxParallel( const SEG& aSeg, int aDistanceThreshold ) const
{ {
ecoord d1, d2; ecoord d1, d2;
mutualDistance( aSeg, d1, d2 ); if( ! mutualDistance( aSeg, d1, d2 ) )
return false;
return std::abs( d1 - d2 ) <= (ecoord) aDistanceThreshold; return std::abs( d1 - d2 ) <= (ecoord) aDistanceThreshold;
} }