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

Fix numeric overflow

Browse Source
This commit is contained in:
Eric Fischer 2016-04-27 16:41:41 -07:00
parent 666565e820
commit 5490f3e15f
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pool.cpp
View File

@ -1,18 +1,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include "memfile.hpp"
#include "pool.hpp"
#define POOL_WIDTH 256
static int hash(const char *s) {
int h = 0;
unsigned h = 0;
for (; *s; s++) {
h = h * 37 + *s;
h = (h * 37 + *s) & ULONG_MAX;
}
h = h & 0xFF;
return h;
return h & 0xFF;
}
struct pool_val *pool(struct pool *p, const char *s, int type) {

15
tile.cpp
View File

@ -501,14 +501,14 @@ int manage_gap(unsigned long long index, unsigned long long *previndex, double s
return 1; // Exact duplicate: can't fulfil the gap requirement
}
if (std::exp(std::log((index - *previndex) / scale) * gamma) >= *gap) {
if (index < *previndex || std::exp(std::log((index - *previndex) / scale) * gamma) >= *gap) {
// Dot is further from the previous than the nth root of the gap,
// so produce it, and choose a new gap at the next point.
*gap = 0;
} else {
return 1;
}
} else {
} else if (index >= *previndex) {
*gap = (index - *previndex) / scale;
if (*gap == 0) {
@ -1182,8 +1182,17 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
if (threads > useful_threads) {
threads = useful_threads;
}
// Round down to a power of 2
threads = 1 << (int) (std::log(threads) / std::log(2));
for (int e = 0; e < 30; e++) {
if (threads >= (1 << e) && threads < (1 << (e + 1))) {
threads = 1 << e;
break;
}
}
if (threads >= (1 << 30)) {
threads = 1 << 30;
}
// Assign temporary files to threads