From affe1615b352efcb0bc2912f7bacfea8c4bacc9a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 12 Aug 2015 10:09:34 -0700 Subject: [PATCH 1/2] minor changelog copy edits [skip ci] --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 789b72580..deee81549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,12 +20,12 @@ Released: August 12, 2015 #### Summary -- Fixed an issue with fields over size of int32 in OGR plugin (https://github.com/mapnik/node-mapnik/issues/499) +- Fixed an issue with fields over size of `int32` in `OGR` plugin (https://github.com/mapnik/node-mapnik/issues/499) - Added 3 new image-filters to simulate types of colorblindness (`color-blind-protanope`,`color-blind-deuteranope`,`color-blind-tritanope`) - Fix so that null text boxes have no bounding boxes when attempting placement ( 162f82cba5b0fb984c425586c6a4b354917abc47 ) - Patch to add legacy method for setting JPEG quality in images ( #3024 ) -- Added `filter_image` method which can modify an image in place or return a new image that is filtered. -- Added missing typedef's in mapnik::geometry to allow experiementing with different containers +- Added `filter_image` method which can modify an image in place or return a new image that is filtered +- Added missing typedef's in `mapnik::geometry` to allow experimenting with different containers ## 3.0.2 From 487226b28986184c8e06a48b93cc9dd693732f2b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 12 Aug 2015 10:54:29 -0700 Subject: [PATCH 2/2] disable OS X builds until ccache/caching is working - refs #3033 --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0e2afb14..b9493a91b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,12 @@ matrix: - os: linux compiler: gcc env: JOBS=6 - - os: osx - compiler: clang - env: JOBS=8 MASON_PUBLISH=true - - os: osx - compiler: clang - env: JOBS=8 COVERAGE=true + #- os: osx + # compiler: clang + # env: JOBS=8 MASON_PUBLISH=true + #- os: osx + # compiler: clang + # env: JOBS=8 COVERAGE=true before_install: - export COVERAGE=${COVERAGE:-false}