[Pkg-javascript-commits] [node-mapnik] 02/09: Merge tag 'upstream/3.5.14+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 67a59f8f23a5bc8e7a8beaa75db4f795b6295f30
Merge: f21da59 81c3137
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 11 14:33:38 2016 +0200

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

 .gitignore                                         |     1 +
 .travis.yml                                        |    34 +-
 CHANGELOG.md                                       |    33 +
 CONTRIBUTING.md                                    |    20 +-
 README.md                                          |    28 +-
 appveyor.yml                                       |     1 -
 binding.gyp                                        |     5 +-
 docs/Feature.md                                    |    14 -
 docs/Geometry.md                                   |    12 -
 docs/Image.md                                      |    35 -
 docs/Logger.md                                     |    24 -
 docs/Map.md                                        |    23 -
 docs/Using-Fonts.md                                |     6 +-
 docs/VectorTile.md                                 |   183 -
 documentation/3.4/assets/bass.css                  |   850 -
 documentation/3.4/assets/github.css                |   123 -
 documentation/3.4/assets/style.css                 |    95 -
 documentation/3.4/index.html                       |  4397 -----
 documentation/3.4/index.json                       | 16508 ------------------
 documentation/3.5/assets/anchor.js                 |   197 -
 documentation/3.5/assets/bass.css                  |     0
 .../3.5/assets/fonts/source-code-pro/LICENSE.txt   |    93 -
 .../3.5/assets/fonts/source-code-pro/README.md     |    20 -
 .../WOFF/OTF/SourceCodePro-Regular.otf.woff        |   Bin 89024 -> 0 bytes
 .../fonts/source-code-pro/source-code-pro.css      |    15 -
 .../3.5/assets/fonts/source-sans-pro/LICENSE.txt   |    93 -
 .../3.5/assets/fonts/source-sans-pro/README.md     |    20 -
 .../WOFF/OTF/SourceSansPro-Bold.otf.woff           |   Bin 124508 -> 0 bytes
 .../WOFF/OTF/SourceSansPro-Light.otf.woff          |   Bin 119280 -> 0 bytes
 .../WOFF/OTF/SourceSansPro-Regular.otf.woff        |   Bin 121876 -> 0 bytes
 .../WOFF/OTF/SourceSansPro-Semibold.otf.woff       |   Bin 123400 -> 0 bytes
 .../3.5/assets/fonts/source-sans-pro/bower.json    |    17 -
 .../fonts/source-sans-pro/source-sans-pro.css      |    31 -
 documentation/3.5/assets/highlight.css             |    83 -
 documentation/3.5/assets/mapnik.css                |   246 -
 documentation/3.5/assets/site.js                   |    40 -
 documentation/3.5/index.html                       | 10621 ------------
 documentation/3.5/index.json                       | 16789 -------------------
 documentation/config.json                          |     8 -
 documentation/index.html                           |     8 -
 lib/mapnik.js                                      |    27 +
 package.json                                       |    14 +-
 scripts/build-appveyor.bat                         |     2 +-
 scripts/build_against_sdk.sh                       |     2 +-
 scripts/is_pr_merge.sh                             |     1 +
 scripts/publish.sh                                 |     2 +-
 src/blend.cpp                                      |    48 +-
 src/blend.hpp                                      |     7 +-
 src/mapnik_datasource.cpp                          |    50 +-
 src/mapnik_feature.cpp                             |    18 +-
 src/mapnik_featureset.cpp                          |     4 +-
 src/mapnik_geometry.cpp                            |    12 +-
 src/mapnik_image.cpp                               |    65 +-
 src/mapnik_image_view.cpp                          |    49 +-
 src/mapnik_image_view.hpp                          |     4 +-
 src/mapnik_logger.cpp                              |     4 +-
 src/mapnik_map.cpp                                 |   156 +-
 src/mapnik_memory_datasource.cpp                   |    49 +-
 src/mapnik_palette.cpp                             |     8 +
 src/mapnik_projection.cpp                          |     2 +-
 src/mapnik_vector_tile.cpp                         |    55 +-
 .../expected-hex-palette-256-tiny.png              |   Bin 0 -> 82 bytes
 test/blend.test.js                                 |     5 +-
 test/data/parse.error.json                         |     8 +
 .../expected/world-reencode-max-extent.png         |   Bin 7990 -> 7994 bytes
 test/datasource.test.js                            |    44 +
 test/feature.test.js                               |     2 +-
 test/geometry.test.js                              |   141 +-
 test/image.test.js                                 |    15 +-
 test/vector-tile.composite.test.js                 |     4 +-
 70 files changed, 687 insertions(+), 50784 deletions(-)

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