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

Handle cases where Simplify removes all outlines 

This could theoretically happen for a fully degenerate polygon

Fixes https://gitlab.com/kicad/code/kicad/issues/12120
This commit is contained in:
Seth Hillbrand 2022-08-26 16:41:04 -07:00
parent dbd38882c0
commit 5a37211fdb
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bitmap2component/bitmap2component.cpp
View File

@ -503,21 +503,22 @@ void BITMAPCONV_INFO::createOutputData( BMP2CMP_MOD_LAYER aModLayer )
polyset_areas.BooleanSubtract( polyset_holes, SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
// Ensure there are no self intersecting polygons
polyset_areas.NormalizeAreaOutlines();
// Convert polygon with holes to a unique polygon
polyset_areas.Fracture( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
// Output current resulting polygon(s)
for( int ii = 0; ii < polyset_areas.OutlineCount(); ii++ )
if( polyset_areas.NormalizeAreaOutlines() )
{
SHAPE_LINE_CHAIN& poly = polyset_areas.Outline( ii );
outputOnePolygon( poly, getBoardLayerName( aModLayer ));
}
// Convert polygon with holes to a unique polygon
polyset_areas.Fracture( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
polyset_areas.RemoveAllContours();
polyset_holes.RemoveAllContours();
main_outline = true;
// Output current resulting polygon(s)
for( int ii = 0; ii < polyset_areas.OutlineCount(); ii++ )
{
SHAPE_LINE_CHAIN& poly = polyset_areas.Outline( ii );
outputOnePolygon( poly, getBoardLayerName( aModLayer ));
}
polyset_areas.RemoveAllContours();
polyset_holes.RemoveAllContours();
main_outline = true;
}
}
paths = paths->next;

6
libs/kimath/src/geometry/shape_poly_set.cpp
View File

@ -1312,7 +1312,9 @@ int SHAPE_POLY_SET::NormalizeAreaOutlines()
BooleanSubtract( holesBuffer, SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
}
RemoveNullSegments();
// In degenerate cases, simplify might return no outlines
if( OutlineCount() > 0 )
RemoveNullSegments();
return OutlineCount();
}
@ -1608,7 +1610,7 @@ int SHAPE_POLY_SET::RemoveNullSegments()
ITERATOR iterator = IterateWithHoles();
VECTOR2I contourStart = *iterator;
VECTOR2I contourStart = *NormalizeAreaOutlinesiterator;
VECTOR2I segmentStart, segmentEnd;
VERTEX_INDEX indexStart;