Merge branch 'master' into earcut-polygon

Conflicts:
	geojson.c
	tile.h
This commit is contained in:
Eric Fischer
2016-04-07 13:50:04 -07:00
9 changed files with 2674 additions and 46 deletions
+6 -1
View File
@@ -440,7 +440,12 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int detail, int buffer, bool cl
}
if (!clipper.Execute(ClipperLib::ctUnion, clipped)) {
fprintf(stderr, "Polygon clean failed\n");
static bool complained = false;
if (!complained) {
fprintf(stderr, "Polygon clean failed\n");
complained = true;
}
}
}