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

Merge pull request #338 from mapbox/warnings

Browse Source 
Fix warnings identified by g++
This commit is contained in:
Eric Fischer 2016-12-14 11:11:29 -08:00 committed by GitHub
commit 5549789da5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tile.cpp
View File

@ -1263,11 +1263,6 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
long long count = 0;
double accum_area = 0;
double interval = 0;
if (z < basezoom) {
interval = std::exp(std::log(droprate) * (basezoom - z));
}
double fraction_accum = 0;
unsigned long long previndex = 0, density_previndex = 0, merge_previndex = 0;
@ -1285,8 +1280,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
int within[child_shards];
long long geompos[child_shards];
memset(within, '\0', sizeof(within));
memset(geompos, '\0', sizeof(geompos));
memset(within, '\0', child_shards * sizeof(int));
memset(geompos, '\0', child_shards * sizeof(long long));
if (*geompos_in != og) {
if (fseek(geoms, og, SEEK_SET) != 0) {
@ -2096,13 +2091,13 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
// Round down to a power of 2
for (int e = 0; e < 30; e++) {
if (threads >= (1 << e) && threads < (1 << (e + 1))) {
threads = 1 << e;
if (threads >= (1U << e) && threads < (1U << (e + 1))) {
threads = 1U << e;
break;
}
}
if (threads >= (1 << 30)) {
threads = 1 << 30;
if (threads >= (1U << 30)) {
threads = 1U << 30;
}
// Assign temporary files to threads