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

Altium PCB import: avoid integer overflows when rotating rectangular fills. 

Fixes artifacts seen in https://gitlab.com/kicad/code/kicad/-/issues/18156
This commit is contained in:
Alex Shvartzkop 2024-06-10 01:00:46 +03:00
parent 9d51fabe9b
commit 3ea314cb9f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/pcb_io/altium/altium_pcb.cpp
View File

@ -3996,8 +3996,8 @@ void ALTIUM_PCB::ConvertFills6ToBoardItem( const AFILL6& aElem )
if( aElem.rotation != 0. ) if( aElem.rotation != 0. )
{ {
VECTOR2I center( ( aElem.pos1.x + aElem.pos2.x ) / 2, VECTOR2I center( aElem.pos1.x / 2 + aElem.pos2.x / 2,
( aElem.pos1.y + aElem.pos2.y ) / 2 ); aElem.pos1.y / 2 + aElem.pos2.y / 2 );
shape.Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) ); shape.Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) );
} }
@ -4027,8 +4027,8 @@ void ALTIUM_PCB::ConvertFills6ToFootprintItem( FOOTPRINT* aFootprint, const AFIL
if( aElem.rotation != 0. ) if( aElem.rotation != 0. )
{ {
VECTOR2I center( ( aElem.pos1.x + aElem.pos2.x ) / 2, VECTOR2I center( aElem.pos1.x / 2 + aElem.pos2.x / 2,
( aElem.pos1.y + aElem.pos2.y ) / 2 ); aElem.pos1.y / 2 + aElem.pos2.y / 2 );
shape.Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) ); shape.Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) );
} }
@ -4069,7 +4069,8 @@ void ALTIUM_PCB::ConvertFills6ToBoardItemOnLayer( const AFILL6& aElem, PCB_LAYER
if( aElem.rotation != 0. ) if( aElem.rotation != 0. )
{ {
// TODO: Do we need SHAPE_T::POLY for non 90° rotations? // TODO: Do we need SHAPE_T::POLY for non 90° rotations?
VECTOR2I center( ( aElem.pos1.x + aElem.pos2.x ) / 2, ( aElem.pos1.y + aElem.pos2.y ) / 2 ); VECTOR2I center( aElem.pos1.x / 2 + aElem.pos2.x / 2,
aElem.pos1.y / 2 + aElem.pos2.y / 2 );
fill->Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) ); fill->Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) );
} }
@ -4092,7 +4093,8 @@ void ALTIUM_PCB::ConvertFills6ToFootprintItemOnLayer( FOOTPRINT* aFootprint, con
if( aElem.rotation != 0. ) if( aElem.rotation != 0. )
{ {
// TODO: Do we need SHAPE_T::POLY for non 90° rotations? // TODO: Do we need SHAPE_T::POLY for non 90° rotations?
VECTOR2I center( ( aElem.pos1.x + aElem.pos2.x ) / 2, ( aElem.pos1.y + aElem.pos2.y ) / 2 ); VECTOR2I center( aElem.pos1.x / 2 + aElem.pos2.x / 2,
aElem.pos1.y / 2 + aElem.pos2.y / 2 );
fill->Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) ); fill->Rotate( center, EDA_ANGLE( aElem.rotation, DEGREES_T ) );
} }