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

Fix edge cases in CIRCLE::Intersect that were causing KiROUND overflow

This commit is contained in:
Roberto Fernandez Bautista 2021-08-11 17:31:27 +01:00
parent eeb9a5d910
commit 22df01183d
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/kimath/src/geometry/circle.cpp
View File

@ -208,6 +208,8 @@ VECTOR2I CIRCLE::NearestPoint( const VECTOR2I& aP ) const
std::vector<VECTOR2I> CIRCLE::Intersect( const CIRCLE& aCircle ) const
{
// From https://mathworld.wolfram.com/Circle-CircleIntersection.html
//
// Simplify the problem:
// Let this circle be centered at (0,0), with radius r1
// Let aCircle be centered at (d, 0), with radius r2
@ -234,7 +236,7 @@ std::vector<VECTOR2I> CIRCLE::Intersect( const CIRCLE& aCircle ) const
int64_t r1 = Radius;
int64_t r2 = aCircle.Radius;
if( d > ( r1 + r2 ) || d == 0 )
if( d > ( r1 + r2 ) || ( d < (std::abs( r1 - r2) ) ) )
return retval; //circles do not intersect
// Equation (3)

32
qa/libs/kimath/geometry/test_circle.cpp
View File

@ -286,6 +286,38 @@ static const std::vector<CIR_CIR_VECPT_CASE> intersect_circle_cases = {
//no points
},
},
{
"KiROUND overflow 1",
{ { 44798001, -94001999 }, 200001 },
{ { 44797999, -94001999 }, 650001 },
{
//no points
},
},
{
"KiROUND overflow 2",
{ { 50747999, -92402001 }, 650001 },
{ { 50748001, -92402001 }, 200001 },
{
//no points
},
},
{
"KiROUND overflow 3",
{ { 43947999, -92402001 }, 650001 },
{ { 43948001, -92402001 }, 200001 },
{
//no points
},
},
{
"KiROUND overflow 4",
{ { 46497999, -94001999 }, 200001 },
{ { 46498001, -94001999 }, 650001 },
{
//no points
},
},
};
// clang-format on