sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Blake Thompson 2015-08-12 13:00:13 -05:00
commit 381a4fc94c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -31,12 +31,12 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: JOBS=6 env: JOBS=6
- os: osx #- os: osx
compiler: clang # compiler: clang
env: JOBS=8 MASON_PUBLISH=true # env: JOBS=8 MASON_PUBLISH=true
- os: osx #- os: osx
compiler: clang # compiler: clang
env: JOBS=8 COVERAGE=true # env: JOBS=8 COVERAGE=true
before_install: before_install:
- export COVERAGE=${COVERAGE:-false} - export COVERAGE=${COVERAGE:-false}

6
CHANGELOG.md
View file

@ -20,12 +20,12 @@ Released: August 12, 2015
#### Summary #### 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`) - 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 ) - 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 ) - 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 `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 missing typedef's in `mapnik::geometry` to allow experimenting with different containers
## 3.0.2 ## 3.0.2