Skip to content

OcdFileImport: Handle emtpy area holes #2144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

OcdFileImport: Handle emtpy area holes #2144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/fileformats/ocd_file_import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 Kai Pastor
* Copyright 2013-2023 Kai Pastor
*
* Some parts taken from file_format_oc*d8{.h,_p.h,cpp} which are
* Copyright 2012 Pete Curtis
Expand Down Expand Up @@ -2153,6 +2153,17 @@ void OcdFileImport::fillPathCoords(OcdImportedPathObject *object, bool is_area,
size_t start = 0;
for (size_t i = 0; i < object->coords.size(); ++i)
{
// There are .ocd files that erroneously contain an empty area hole, i.e., there are two subsequent points
// with the Ocd::OcdPoint32::FlagHole property. To fix this, the first of these points needs to be ignored.
// Since setPointFlags() applies the HolePoint property to the last point instead of the first point of the next part,
// the consequence is that instead of removing the first point of these two .ocd points,
// the second point of the two Mapper points with the HolePoint property needs to be removed.
// Using a loop ensures that multiple subsequent empty area holes are removed.
while (is_area && i < object->coords.size() - 1 && object->coords[i].isHolePoint() && object->coords[i+1].isHolePoint())
Copy link
Member

@dg0yt dg0yt Apr 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be better to use a separate loop (or STL algorithm) then to nest loops.

{
object->coords.erase(begin(object->coords) + i + 1);
}

if (!object->coords[i].isHolePoint() && i < object->coords.size() - 1)
continue;

Expand Down