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

SHAPE_ARC::update_bbox(): use double instead of int to calculate radius, and 

if the radius is too large (> INT_MAX/2), consider arc as a segment to avoid overflows.
Nor perfect, but it avoid some issues when calculating bbox.
This commit is contained in:
jean-pierre charras 2024-02-29 18:01:13 +01:00
parent cd27f801f6
commit 8ffd4f636a
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/kimath/src/geometry/shape_arc.cpp
View File

@ -328,25 +328,34 @@ void SHAPE_ARC::update_bbox()
int quad_angle_start = std::ceil( start_angle.AsDegrees() / 90.0 ); int quad_angle_start = std::ceil( start_angle.AsDegrees() / 90.0 );
int quad_angle_end = std::floor( end_angle.AsDegrees() / 90.0 ); int quad_angle_end = std::floor( end_angle.AsDegrees() / 90.0 );
VECTOR2I center = GetCenter(); // very large radius means the arc is similar to a segment
const int radius = KiROUND( GetRadius() ); // so do not try to add more points, center cannot be handled
// Very large is here > INT_MAX/2
double d_radius = GetRadius();
// count through quadrants included in arc if( d_radius < INT_MAX/2 )
for( int quad_angle = quad_angle_start; quad_angle <= quad_angle_end; ++quad_angle )
{ {
VECTOR2I quad_pt = center; VECTOR2I center = GetCenter();
switch( quad_angle % 4 ) const int radius = KiROUND( d_radius );
// count through quadrants included in arc
for( int quad_angle = quad_angle_start; quad_angle <= quad_angle_end; ++quad_angle )
{ {
case 0: quad_pt += { radius, 0 }; break; VECTOR2I quad_pt = center;
case 1: case -3: quad_pt += { 0, radius }; break;
case 2: case -2: quad_pt += { -radius, 0 }; break;
case 3: case -1: quad_pt += { 0, -radius }; break;
default:
assert( false );
}
points.push_back( quad_pt ); switch( quad_angle % 4 )
{
case 0: quad_pt += { radius, 0 }; break;
case 1: case -3: quad_pt += { 0, radius }; break;
case 2: case -2: quad_pt += { -radius, 0 }; break;
case 3: case -1: quad_pt += { 0, -radius }; break;
default:
assert( false );
}
points.push_back( quad_pt );
}
} }
m_bbox.Compute( points ); m_bbox.Compute( points );