From 255960b48d8dffeaaa47968e00ce5f77f55cafb8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sun, 20 Dec 2015 15:09:35 -0800
Subject: [PATCH 1/5] Add travis

---
 .travis.yml | 17 +++++++++++++++++
 README.md   |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..7fd7b5e7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: c
+
+sudo: false
+
+matrix:
+    - os: linux
+      addons:
+        apt:
+          packages: [ 'protobuf-compiler', 'libprotobuf-dev' ]
+
+
+install:
+ - make
+
+script:
+ - echo '{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[0,0]}}' > test.json
+ - ./tippecanoe -o test.mbtiles test.json
diff --git a/README.md b/README.md
index 4f71c887..3ad7f941 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ tippecanoe
 Builds [vector tilesets](https://www.mapbox.com/developers/vector-tiles/) from large collections of [GeoJSON](http://geojson.org/)
 features. This is a tool for [making maps from huge datasets](MADE_WITH.md).
 
+[![Build Status](https://travis-ci.org/mapbox/tippecanoe.svg)](https://travis-ci.org/mapbox/tippecanoe)
+
 Intent
 ------
 

From ee35b9f7c9eca72b1eb0cae8121b93e03b7c1560 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sun, 20 Dec 2015 15:11:15 -0800
Subject: [PATCH 2/5] fix matrix

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7fd7b5e7..3960bb1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: c
 sudo: false
 
 matrix:
+  include:
     - os: linux
       addons:
         apt:

From fee18cc31e8744d193552b1f7c19fb808f056073 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sun, 20 Dec 2015 15:13:33 -0800
Subject: [PATCH 3/5] Add errno.h - refs #131

---
 tile.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tile.cc b/tile.cc
index 22f40680..39a5f1d7 100644
--- a/tile.cc
+++ b/tile.cc
@@ -17,6 +17,7 @@
 #include <math.h>
 #include <sqlite3.h>
 #include <pthread.h>
+#include <errno.h>
 #include "vector_tile.pb.h"
 #include "geometry.hh"
 

From edd325e3385841edca25fe92531b86a4e3c9f279 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Tue, 22 Dec 2015 10:33:08 -0800
Subject: [PATCH 4/5] Round the number of threads to use down to a power of 2

Since other calculations depend on this being true
---
 geojson.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/geojson.c b/geojson.c
index 6248b570..f968cfc9 100644
--- a/geojson.c
+++ b/geojson.c
@@ -70,6 +70,9 @@ void init_cpus() {
 		CPUS = 1;
 	}
 
+	// Round down to a power of 2
+	CPUS = 1 << (int) (log(CPUS) / log(2));
+
 	TEMP_FILES = 64;
 	struct rlimit rl;
 	if (getrlimit(RLIMIT_NOFILE, &rl) != 0) {

From f290794f228e23f56e7b5f792735211a47df4ae2 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Tue, 22 Dec 2015 10:40:13 -0800
Subject: [PATCH 5/5] Bump version number

---
 CHANGELOG.md | 5 +++++
 version.h    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52a6daa3..6ed8a054 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.5.1
+
+* Fix internal error when number of CPUs is not a power of 2
+* Add missing #include
+
 ## 1.5.0
 
 * Base zoom for dot-dropping can be specified independently of
diff --git a/version.h b/version.h
index 955f1929..21c9cfbb 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "tippecanoe v1.5.0\n"
+#define VERSION "tippecanoe v1.5.1\n"