ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-01-22 04:18:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update clipper to 381c817fd13e8

Browse Source
This commit is contained in:
Eric Fischer 2016-04-13 10:18:32 -07:00
parent cb4a83776e
commit 4dba8b3f70
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clipper/clipper.cpp
View File

@ -3986,11 +3986,27 @@ void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec)
{ {
if (outRec->IsHole == OuterOutRec->IsHole) if (outRec->IsHole == OuterOutRec->IsHole)
{ {
outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft); if (Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
{
outRec->FirstLeft = OuterOutRec;
}
else
{
outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
}
} }
else else
{ {
outRec->FirstLeft = OuterOutRec; if (Area(outRec->Pts) == 0.0 && !Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
{
outRec->IsHole = !outRec->IsHole;
outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
ReversePolyPtLinks(outRec->Pts);
}
else
{
outRec->FirstLeft = OuterOutRec;
}
} }
} }
} }
@ -5215,6 +5231,8 @@ void Clipper::DoSimplePolygons()
dupeRec.emplace(outrec2->Idx, intPt2); dupeRec.emplace(outrec2->Idx, intPt2);
} }
} }
outRec_j = GetOutRec(m_OutPts[j]->Idx);
idx_j = outRec_j->Idx;
} }
continue; continue;
} }