ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-03-31 16:00:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #234 from mapbox/clipper-update

Browse Source 
Update clipper to 9edc2924e39:
This commit is contained in:
Eric Fischer 2016-05-02 16:31:10 -07:00
commit 68c3bafab0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.11.2
* Update Clipper to fix potential crash
## 1.11.1
* Make better use of C++ standard libraries

4
clipper/clipper.cpp
View File

@ -4643,7 +4643,7 @@ bool Clipper::FindIntersectLoop(std::unordered_multimap<int, OutPtIntersect> & d
range = dupeRec.equal_range(idx_search);
visited.insert(idx_search);
// Check for connection through chain of other intersections
for (auto it = range.first; it != range.second; ++it)
for (auto it = range.first; it != range.second && it != dupeRec.end() && it->first == idx_search; ++it)
{
OutRec * itRec = GetOutRec(it->second.op2->Idx);
if (visited.count(itRec->Idx) > 0 ||
@ -4741,7 +4741,7 @@ bool Clipper::FixIntersects(std::unordered_multimap<int, OutPtIntersect> & dupeR
std::set<int> visited;
visited.insert(outRec_search->Idx);
// Check for connection through chain of other intersections
for (auto it = range.first; it != range.second; ++it)
for (auto it = range.first; it != range.second && it != dupeRec.end() && it->first == outRec_search->Idx; ++it)
{
OutRec * itRec = GetOutRec(it->second.op2->Idx);
if (itRec->Idx != outRec_search->Idx &&

2
version.hpp
View File

@ -1 +1 @@
#define VERSION "tippecanoe v1.11.1\n"
#define VERSION "tippecanoe v1.11.2\n"