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

Fix RemoveNullSegments

This commit is contained in:
Seth Hillbrand 2022-08-29 17:07:36 -07:00
parent eda27a09d6
commit df8b7a8fef
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1614,6 +1614,7 @@ int SHAPE_POLY_SET::RemoveNullSegments()
VECTOR2I segmentStart, segmentEnd; VECTOR2I segmentStart, segmentEnd;
VERTEX_INDEX indexStart; VERTEX_INDEX indexStart;
std::vector<VERTEX_INDEX> indices_to_remove;
while( iterator ) while( iterator )
{ {
@ -1629,6 +1630,8 @@ int SHAPE_POLY_SET::RemoveNullSegments()
// Advance // Advance
iterator++; iterator++;
// If we have rolled into the next contour, remember its position
// segmentStart and segmentEnd remain valid for comparison here
if( iterator ) if( iterator )
contourStart = *iterator; contourStart = *iterator;
} }
@ -1637,22 +1640,25 @@ int SHAPE_POLY_SET::RemoveNullSegments()
// Advance // Advance
iterator++; iterator++;
if( iterator ) // If we have reached the end of the SHAPE_POLY_SET, something is broken here
segmentEnd = *iterator; wxCHECK_MSG( iterator, removed, wxT( "Invalid polygon. Reached end without noticing. Please report this error" ) );
segmentEnd = *iterator;
} }
// Remove segment start if both points are equal // Remove segment start if both points are equal
if( segmentStart == segmentEnd ) if( segmentStart == segmentEnd )
{ {
RemoveVertex( indexStart ); indices_to_remove.push_back( indexStart );
removed++; removed++;
// Advance the iterator one position, as there is one vertex less.
if( iterator )
iterator++;
} }
} }
// Proceed in reverse direction to remove the vertices because they are stored as absolute indices in a vector
// Removing in reverse order preserves the remaining index values
for( auto it = indices_to_remove.rbegin(); it != indices_to_remove.rend(); ++it )
RemoveVertex( *it );
return removed; return removed;
} }