From e5157ec66b924d97ad38f1353b6d14d2886560fa Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 31 Mar 2016 11:39:12 -0700 Subject: [PATCH 1/2] Fix where I used the wrong names for the max/min long long constants --- geometry.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/geometry.cc b/geometry.cc index e7aabff..2cccbb5 100644 --- a/geometry.cc +++ b/geometry.cc @@ -21,10 +21,10 @@ extern "C" { drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, int detail, long long *bbox, unsigned initial_x, unsigned initial_y) { drawvec out; - bbox[0] = LONG_LONG_MAX; - bbox[1] = LONG_LONG_MAX; - bbox[2] = LONG_LONG_MIN; - bbox[3] = LONG_LONG_MIN; + bbox[0] = LLONG_MAX; + bbox[1] = LLONG_MAX; + bbox[2] = LLONG_MIN; + bbox[3] = LLONG_MIN; long long wx = initial_x, wy = initial_y; @@ -165,7 +165,7 @@ drawvec shrink_lines(drawvec &geom, int z, int detail, int basezoom, long long * long long d = sqrt(dx * dx + dy * dy); long long n; - long long next = LONG_LONG_MAX; + long long next = LLONG_MAX; for (n = *here; n < *here + d; n = next) { int within; @@ -960,7 +960,7 @@ std::vector chop_polygon(std::vector &geoms) { for (size_t i = 0; i < geoms.size(); i++) { if (geoms[i].size() > 700) { long long midx = 0, midy = 0, count = 0; - long long maxx = LONG_LONG_MIN, maxy = LONG_LONG_MIN, minx = LONG_LONG_MAX, miny = LONG_LONG_MAX; + long long maxx = LLONG_MIN, maxy = LLONG_MIN, minx = LLONG_MAX, miny = LLONG_MAX; for (size_t j = 0; j < geoms[i].size(); j++) { if (geoms[i][j].op == VT_MOVETO || geoms[i][j].op == VT_LINETO) { From 389cdf2aa4f534f9b51e92385ba3dcf579a27fa8 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 31 Mar 2016 11:44:04 -0700 Subject: [PATCH 2/2] Bump version number --- CHANGELOG.md | 4 ++++ version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aad67e4..4d86c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.9.7 + +* Fix build problem (wrong spelling of long long max/min constants) + ## 1.9.6 * Add an option to give specific layer names to specific input files diff --git a/version.h b/version.h index 686ebe0..e7dff78 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "tippecanoe v1.9.6\n" +#define VERSION "tippecanoe v1.9.7\n"