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 branch 'master' into plugins

Browse Source
This commit is contained in:
Eric Fischer 2017-05-04 10:19:32 -07:00
commit f9f57ebb3f
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.17.4
* Fix RFC 8142 support: Don't try to split *all* memory mapped files
## 1.17.3 ## 1.17.3
* Support RFC 8142 GeoJSON text sequences * Support RFC 8142 GeoJSON text sequences

4
main.cpp
View File

@ -1208,7 +1208,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
char *map = NULL; char *map = NULL;
off_t off = 0; off_t off = 0;
int read_parallel_this = read_parallel ? '\n' : 0x1E; int read_parallel_this = read_parallel ? '\n' : 0;
if (1) { if (1) {
if (fstat(fd, &st) == 0) { if (fstat(fd, &st) == 0) {
@ -1240,7 +1240,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
} }
} }
if (map != NULL && map != MAP_FAILED) { if (map != NULL && map != MAP_FAILED && read_parallel_this) {
do_read_parallel(map, st.st_size - off, overall_offset, reading.c_str(), reader, &progress_seq, exclude, include, exclude_all, fname, basezoom, layer, nlayers, &layermaps, droprate, initialized, initial_x, initial_y, maxzoom, sources[layer].layer, uses_gamma, attribute_types, read_parallel_this); do_read_parallel(map, st.st_size - off, overall_offset, reading.c_str(), reader, &progress_seq, exclude, include, exclude_all, fname, basezoom, layer, nlayers, &layermaps, droprate, initialized, initial_x, initial_y, maxzoom, sources[layer].layer, uses_gamma, attribute_types, read_parallel_this);
overall_offset += st.st_size - off; overall_offset += st.st_size - off;
checkdisk(reader, CPUS); checkdisk(reader, CPUS);

2
version.hpp
View File

@ -1 +1 @@
#define VERSION "tippecanoe v1.17.3\n" #define VERSION "tippecanoe v1.17.4\n"