Merge pull request #1 from CartoDB/cdb-1.x-bump-sdk-699-g996ea2d

Upgrade mapnik sdk to 699-g996ea2d
CartoDB · May 31, 2016 · 12669bd · 12669bd
2 parents 0a786c4 + cae2630
commit 12669bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "url"           : "http://github.com/mapnik/node-mapnik",
   "homepage"      : "http://mapnik.org",
   "author"        : "Dane Springmeyer <[email protected]> (mapnik.org)",
-  "version"       : "1.4.15-cdb7",
+  "version"       : "1.4.15-cdb8",
   "main"          : "./lib/mapnik.js",
   "binary": {
       "module_name" : "mapnik",

diff --git a/scripts/build_against_sdk.sh b/scripts/build_against_sdk.sh
@@ -98,7 +98,7 @@ if [[ "${CXX11:-false}" != false ]]; then
     HASH="1702-g65bd9e6"
 else
     # mapnik 2.3.x / c++11 not enabled
-    HASH="698-g352db3a"
+    HASH="699-g996ea2d"
 fi
 
 if [[ ${platform} == 'linux' ]]; then

diff --git a/test/data/vector_tile/tile0-c.expected.png b/test/data/vector_tile/tile0-c.expected.png