[Pkg-javascript-commits] [node-mapnik] 03/08: Merge tag 'upstream/3.7.1+dfsg'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository node-mapnik.

commit d1b28c0f93fc88dd11f65139eb82e8a007f40c62
Merge: d2bbc43 522271f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 4 13:19:06 2018 +0100

    Merge tag 'upstream/3.7.1+dfsg'
    
    Upstream version 3.7.1+dfsg

 .gitignore                                         |   4 +-
 .npmignore                                         |   2 +-
 .travis.yml                                        |  59 +++-
 CHANGELOG.md                                       |  14 +
 Makefile                                           |  41 ++-
 README.md                                          |  60 ++--
 appveyor.yml                                       |  45 ---
 binding.gyp                                        |  39 +--
 gen_settings.py                                    |  39 ---
 package.json                                       |  14 +-
 scripts/build-appveyor.bat                         | 136 --------
 scripts/build-local.bat                            |  65 ----
 ...uild_against_sdk_02-copy-deps-to-bindingdir.ps1 |  40 ---
 .../build_against_sdk_03-write-mapnik.settings.ps1 |  24 --
 scripts/check_glibcxx.sh                           |  33 ++
 install_mason.sh => scripts/install_deps.sh        |  20 +-
 scripts/postinstall.sh                             |  24 ++
 scripts/setup.sh                                   |   6 +-
 src/glibc_workaround.cpp                           |  26 ++
 src/mapnik_color.cpp                               |  29 +-
 src/mapnik_datasource.cpp                          |   4 +-
 src/mapnik_feature.cpp                             |   8 +-
 src/mapnik_featureset.cpp                          |  10 +-
 src/mapnik_geometry.cpp                            |   4 +-
 src/mapnik_grid_view.cpp                           |   6 +-
 src/mapnik_image.cpp                               | 361 ++++++++++++---------
 src/mapnik_image_view.cpp                          |  13 +-
 src/mapnik_layer.cpp                               |  26 +-
 src/mapnik_map.cpp                                 |  36 +-
 src/mapnik_memory_datasource.cpp                   |   5 +-
 src/mapnik_projection.cpp                          |   4 +-
 src/mapnik_vector_tile.cpp                         |  18 +-
 test/data/images/san-marino.svg                    |  92 ++++++
 .../vector_tile/compositing/expected/2-1-1b.png    | Bin 154739 -> 154748 bytes
 .../expected/world-reencode-max-extent.png         | Bin 7993 -> 7992 bytes
 .../compositing/expected/world-reencode.png        | Bin 7981 -> 7980 bytes
 test/data/vector_tile/nz-1.png                     | Bin 26701 -> 26699 bytes
 test/data/vector_tile/nz-1b.png                    | Bin 25817 -> 25832 bytes
 test/data/vector_tile/tile-raster.expected.jpg     | Bin 5247 -> 5230 bytes
 test/data/vector_tile/tile0-c.expected.png         | Bin 13780 -> 13783 bytes
 .../data/vector_tile/tile0-simple_and_distance.mvt | Bin 55751 -> 55744 bytes
 ...nce.mvt => tile0-simple_and_distance.nosse.mvt} | Bin 55751 -> 55742 bytes
 test/data/vector_tile/tile0-simplify_distance.mvt  | Bin 55751 -> 55744 bytes
 ...tance.mvt => tile0-simplify_distance.nosse.mvt} | Bin 55751 -> 55742 bytes
 test/datasource.test.js                            |  13 +-
 test/image.svg.test.js                             |  14 +-
 test/vector-tile.test.js                           |  34 +-
 47 files changed, 688 insertions(+), 680 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git