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

Fix fishy logic in SHAPE_LINE_CHAIN::Collide().

This commit is contained in:
Jeff Young 2024-04-01 17:03:15 +01:00
parent 06b199fd41
commit 78bec3f1ba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,13 +655,16 @@ bool SHAPE_LINE_CHAIN::Collide( const SEG& aSeg, int aClearance, int* aActual,
return true;
}
int dist = 0;
int closest_dist = sqrt( closest_dist_sq );
int closest_dist = std::numeric_limits<int>::max();
if( closest_dist_sq < VECTOR2I ::ECOORD_MAX )
closest_dist = sqrt( closest_dist_sq );
// Collide arc segments
for( size_t i = 0; i < ArcCount(); i++ )
{
const SHAPE_ARC& arc = Arc( i );
int dist = 0;
// The arcs in the chain should have zero width
wxASSERT_MSG( arc.GetWidth() == 0, wxT( "Invalid arc width - should be zero" ) );
@ -673,9 +676,7 @@ bool SHAPE_LINE_CHAIN::Collide( const SEG& aSeg, int aClearance, int* aActual,
return true;
if( dist < closest_dist )
{
closest_dist = dist;
}
}
}