From acdb5b72db15b45eccca0d3c3b3e47ee3315fff1 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 1 May 2017 15:26:53 -0700 Subject: [PATCH] Fix RFC 8142 support: Don't try to split *all* memory mapped files --- CHANGELOG.md | 4 ++++ main.cpp | 4 ++-- version.hpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be760cb..e0ffb96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.17.4 + +* Fix RFC 8142 support: Don't try to split *all* memory mapped files + ## 1.17.3 * Support RFC 8142 GeoJSON text sequences diff --git a/main.cpp b/main.cpp index 0fb4d65..436af22 100644 --- a/main.cpp +++ b/main.cpp @@ -1202,7 +1202,7 @@ int read_input(std::vector &sources, char *fname, int &maxzoom, int minz char *map = NULL; off_t off = 0; - int read_parallel_this = read_parallel ? '\n' : 0x1E; + int read_parallel_this = read_parallel ? '\n' : 0; if (1) { if (fstat(fd, &st) == 0) { @@ -1234,7 +1234,7 @@ int read_input(std::vector &sources, char *fname, int &maxzoom, int minz } } - 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); overall_offset += st.st_size - off; checkdisk(reader, CPUS); diff --git a/version.hpp b/version.hpp index c512260..65d04a1 100644 --- a/version.hpp +++ b/version.hpp @@ -1 +1 @@ -#define VERSION "tippecanoe v1.17.3\n" +#define VERSION "tippecanoe v1.17.4\n"