realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Div-by-zero safety.

Browse Source
This commit is contained in:
Jeff Young 2025-06-02 14:07:34 +01:00
parent e5682ff2c1
commit fa2c085c79
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/import_gfx/graphics_importer_buffer.cpp
View File

@ -123,8 +123,7 @@ void GRAPHICS_IMPORTER_BUFFER::ImportTo( GRAPHICS_IMPORTER& aImporter )
( aImporter.GetMillimeterToIuFactor() + 100 ); ( aImporter.GetMillimeterToIuFactor() + 100 );
double max_scale = std::max( scale_factor / boundingBox.GetSize().x, double max_scale = std::max( scale_factor / boundingBox.GetSize().x,
scale_factor / boundingBox.GetSize().y ); scale_factor / boundingBox.GetSize().y );
aImporter.ReportMsg( wxString::Format( _( "Imported graphic is too large. Maximum scale " aImporter.ReportMsg( wxString::Format( _( "Imported graphic is too large. Maximum scale is %f" ),
"is %f" ),
max_scale ) ); max_scale ) );
return; return;
} }
@ -146,22 +145,17 @@ void GRAPHICS_IMPORTER_BUFFER::ImportTo( GRAPHICS_IMPORTER& aImporter )
double total_scale_x = aImporter.GetScale().x * aImporter.GetMillimeterToIuFactor(); double total_scale_x = aImporter.GetScale().x * aImporter.GetMillimeterToIuFactor();
double total_scale_y = aImporter.GetScale().y * aImporter.GetMillimeterToIuFactor(); double total_scale_y = aImporter.GetScale().y * aImporter.GetMillimeterToIuFactor();
double max_offset_x = double max_offset_x = ( aImporter.GetImportOffsetMM().x + boundingBox.GetRight() ) * total_scale_x;
( aImporter.GetImportOffsetMM().x + boundingBox.GetRight() ) * total_scale_x; double max_offset_y = ( aImporter.GetImportOffsetMM().y + boundingBox.GetBottom() ) * total_scale_y;
double max_offset_y = double min_offset_x = ( aImporter.GetImportOffsetMM().x + boundingBox.GetLeft() ) * total_scale_x;
( aImporter.GetImportOffsetMM().y + boundingBox.GetBottom() ) * total_scale_y; double min_offset_y = ( aImporter.GetImportOffsetMM().y + boundingBox.GetTop() ) * total_scale_y;
double min_offset_x =
( aImporter.GetImportOffsetMM().x + boundingBox.GetLeft() ) * total_scale_x;
double min_offset_y =
( aImporter.GetImportOffsetMM().y + boundingBox.GetTop() ) * total_scale_y;
VECTOR2D newOffset = aImporter.GetImportOffsetMM(); VECTOR2D newOffset = aImporter.GetImportOffsetMM();
bool needsAdjustment = false; bool needsAdjustment = false;
if( max_offset_x >= std::numeric_limits<int>::max() ) if( max_offset_x >= std::numeric_limits<int>::max() )
{ {
newOffset.x -= ( max_offset_x - std::numeric_limits<int>::max() + 100.0 ) / newOffset.x -= ( max_offset_x - std::numeric_limits<int>::max() + 100.0 ) / total_scale_x;
total_scale_x;
needsAdjustment = true; needsAdjustment = true;
} }
else if( min_offset_x <= std::numeric_limits<int>::min() ) else if( min_offset_x <= std::numeric_limits<int>::min() )
@ -226,6 +220,8 @@ static void convertPolygon( std::list<std::unique_ptr<IMPORTED_SHAPE>>& aShapes,
double origH = ( maxY - minY ); double origH = ( maxY - minY );
double upscaledW, upscaledH; double upscaledW, upscaledH;
wxCHECK( origH && origW, /* void */ );
if( origW > origH ) if( origW > origH )
{ {
upscaledW = convert_scale; upscaledW = convert_scale;
@ -256,6 +252,7 @@ static void convertPolygon( std::list<std::unique_ptr<IMPORTED_SHAPE>>& aShapes,
int yp = KiROUND( ( v.y - minY ) * ( upscaledH / origH ) ); int yp = KiROUND( ( v.y - minY ) * ( upscaledH / origH ) );
lc.Append( xp, yp ); lc.Append( xp, yp );
} }
lc.SetClosed( true ); lc.SetClosed( true );
upscaledPaths.push_back( lc ); upscaledPaths.push_back( lc );
} }
@ -277,8 +274,7 @@ static void convertPolygon( std::list<std::unique_ptr<IMPORTED_SHAPE>>& aShapes,
pts.emplace_back( VECTOR2D( xp, yp ) ); pts.emplace_back( VECTOR2D( xp, yp ) );
} }
aShapes.push_back( aShapes.push_back( std::make_unique<IMPORTED_POLYGON>( pts, aStroke, aFilled, aFillColor ) );
std::make_unique<IMPORTED_POLYGON>( pts, aStroke, aFilled, aFillColor ) );
} }
for( IMPORTED_POLYGON* openPath : openPaths ) for( IMPORTED_POLYGON* openPath : openPaths )