[Pkg-javascript-commits] [node-mapnik] 15/15: Merge tag 'upstream/3.3.0+dfsg'
Jérémy Lal
kapouer at moszumanska.debian.org
Wed May 27 19:57:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master
in repository node-mapnik.
commit 8bd31c4678aab20d2da658b803c46f95eed71361
Merge: 26e1946 6aef0d6
Author: Jérémy Lal <kapouer at melix.org>
Date: Wed May 27 21:57:08 2015 +0200
Merge tag 'upstream/3.3.0+dfsg'
Upstream version 3.3.0+dfsg
# gpg: Signature faite le mer. 27 mai 2015 21:57:05 CEST avec la clef RSA d'identifiant DD39F374
# gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
# gpg: alias « Jérémy Lal <jerry at edagames.com> »
# gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
# gpg: Rien n'indique que la signature appartient à son propriétaire.
# Empreinte de clef principale : 03C4 E7AB B880 F524 306E 4815 6611 C05E DD39 F374
.npmignore | 4 +
.travis.yml | 108 +-
CHANGELOG.md | 166 ++
Makefile | 35 +-
README.md | 11 +-
appveyor.yml | 104 +-
bench/boundary.pbf | Bin 0 -> 214 bytes
bench/error/test_vt_abort.js | 46 +
bench/error/test_vt_abort2.js | 44 +
bin/mapnik-inspect.js | 8 +-
bin/mapnik-render.js | 4 +-
bin/mapnik-shapeindex.js | 29 +
binding.gyp | 42 +-
common.gypi | 17 +-
docs/Contributing.md | 81 +
docs/Feature.md | 14 +
docs/Geometry.md | 12 +
docs/Image.md | 35 +
docs/Logger.md | 24 +
docs/Map.md | 23 +
docs/Using-Fonts.md | 89 ++
docs/VectorTile.md | 183 +++
lib/mapnik.js | 21 +-
package.json | 35 +-
scripts/before-build.bat | 31 +
scripts/build_against_sdk.sh | 98 +-
scripts/build_against_sdk_00-START-HERE.bat | 54 -
scripts/build_against_sdk_01-download-deps.ps1 | 44 -
...uild_against_sdk_02-copy-deps-to-bindingdir.ps1 | 31 +-
.../build_against_sdk_03-write-mapnik.settings.ps1 | 2 +-
scripts/install_node.sh | 9 +
scripts/package_osx.sh | 4 +-
scripts/remove_node.bat | 7 +
scripts/setup_cpp11_toolchain.sh | 72 +
scripts/show_module_runtime.ps1 | 12 +
src/blend.cpp | 209 +--
src/blend.hpp | 28 +-
src/ds_emitter.hpp | 22 +-
src/js_grid_utils.hpp | 10 +-
src/mapnik_.cpp | 31 -
src/mapnik_.hpp | 31 -
src/mapnik_cairo_surface.cpp | 2 +-
src/mapnik_cairo_surface.hpp | 10 +
src/mapnik_color.cpp | 151 +-
src/mapnik_color.hpp | 13 +-
src/mapnik_datasource.cpp | 23 +-
src/mapnik_datasource.hpp | 10 +-
src/mapnik_expression.cpp | 53 +-
src/mapnik_expression.hpp | 9 +-
src/mapnik_feature.cpp | 193 +--
src/mapnik_feature.hpp | 19 +-
src/mapnik_featureset.cpp | 6 +-
src/mapnik_featureset.hpp | 8 +-
src/mapnik_fonts.hpp | 30 +-
src/mapnik_geometry.cpp | 264 +++-
src/mapnik_geometry.hpp | 28 +-
src/mapnik_grid.cpp | 171 +-
src/mapnik_grid.hpp | 17 +-
src/mapnik_grid_view.cpp | 106 +-
src/mapnik_grid_view.hpp | 12 +-
src/mapnik_image.cpp | 1338 ++++++++++++----
src/mapnik_image.hpp | 40 +-
src/mapnik_image_view.cpp | 212 ++-
src/mapnik_image_view.hpp | 15 +-
src/mapnik_layer.cpp | 137 +-
src/mapnik_layer.hpp | 10 +-
src/mapnik_logger.cpp | 61 +
src/mapnik_logger.hpp | 33 +
src/mapnik_map.cpp | 879 +++++++----
src/mapnik_map.hpp | 20 +-
src/mapnik_memory_datasource.cpp | 43 +-
src/mapnik_memory_datasource.hpp | 6 +-
src/mapnik_palette.cpp | 19 +-
src/mapnik_palette.hpp | 9 +-
src/mapnik_projection.cpp | 36 +-
src/mapnik_projection.hpp | 18 +-
src/mapnik_vector_tile.cpp | 1640 ++++++++++++--------
src/mapnik_vector_tile.hpp | 21 +-
src/node_mapnik.cpp | 45 +-
src/reader.hpp | 75 -
src/tint.hpp | 25 +-
src/utils.hpp | 76 +-
test/blend-fixtures/1.png | Bin 0 -> 10373 bytes
test/blend-fixtures/1a.png | Bin 0 -> 15831 bytes
test/blend-fixtures/1x1.png | Bin 0 -> 508 bytes
test/blend-fixtures/2.png | Bin 0 -> 96891 bytes
test/blend-fixtures/2a.png | Bin 0 -> 30365 bytes
test/blend-fixtures/3.png | Bin 0 -> 9548 bytes
test/blend-fixtures/corrupt-1.png | Bin 0 -> 8124 bytes
test/blend-fixtures/expected-compression-5.webp | Bin 0 -> 9070 bytes
test/blend-fixtures/expected-hex-palette-256.png | Bin 0 -> 8083 bytes
test/blend-fixtures/expected-matte-6.png | Bin 0 -> 104353 bytes
test/blend-fixtures/expected-matte-8.png | Bin 0 -> 24109 bytes
test/blend-fixtures/expected-object-tint.png | Bin 0 -> 28662 bytes
test/blend-fixtures/expected-object-x-y.png | Bin 0 -> 107676 bytes
test/blend-fixtures/expected-oct-palette-256.png | Bin 0 -> 39926 bytes
test/blend-fixtures/expected-palette-256.png | Bin 0 -> 22662 bytes
test/blend-fixtures/expected.jpg | Bin 0 -> 15187 bytes
test/blend-fixtures/expected.png | Bin 0 -> 104353 bytes
test/blend-fixtures/expected.webp | Bin 0 -> 9458 bytes
test/blend-fixtures/not_a_real_image.txt | 1 +
test/blend.test.js | 451 ++++++
test/cairo_surface.test.js | 4 +-
test/color.test.js | 72 +-
test/compositing.test.js | 35 +-
test/constants.test.js | 2 +
test/data/images/corrupt-10x10.png | Bin 0 -> 92 bytes
.../data/map-a/DejaVuSerifCondensed-BoldItalic.ttf | Bin 0 -> 335940 bytes
test/data/map-b/DejaVuSerifCondensed-Bold.ttf | Bin 0 -> 320720 bytes
test/data/vector_tile/tile-raster.expected.jpg | Bin 6606 -> 7768 bytes
test/data/vector_tile/tile0-b.expected.png | Bin 15931 -> 15538 bytes
test/data/vector_tile/tile0-c.expected.png | Bin 14148 -> 13333 bytes
test/data/vector_tile/tile0.expected-cairo.svg | 436 +++---
test/data/vector_tile/tile0.expected-svg.svg | 439 +++---
test/data/vector_tile/tile0.expected.grid.json | 72 +-
test/data/vector_tile/tile0.expected.png | Bin 17667 -> 17101 bytes
test/data/vector_tile/tile0.vector.pbf | Bin 87994 -> 50297 bytes
test/data/vector_tile/tile2.vector.pbf | Bin 449 -> 429 bytes
test/datasource.test.js | 72 +-
test/expression.test.js | 21 +-
test/feature.test.js | 235 ++-
test/font_path.test.js | 2 +
test/fonts.test.js | 127 +-
test/geometry.test.js | 75 +
test/geotiff-load.test.js | 14 +-
test/grid.test.js | 85 +-
test/grid_view.test.js | 28 +-
test/image.test.js | 543 ++++++-
test/image_view.test.js | 177 ++-
test/layers.test.js | 29 +-
test/logger.test.js | 16 +
test/map.test.js | 247 ++-
test/map_generation.test.js | 8 +-
test/mapnik-shapeindex.test.js | 56 +
test/palette.test.js | 23 +-
test/parameters.test.js | 22 +-
test/proj_transform.test.js | 55 +-
test/projection.test.js | 22 +-
test/query-map.test.js | 63 +-
test/render-async.test.js | 102 +-
test/render-sync.test.js | 172 +-
test/render_grid.test.js | 95 +-
test/shp2geojson.test.js | 8 +-
test/support/extra_arbitary_map_parameters.xml | 24 +-
test/support/grid2.json | 744 +++++++++
test/support/helper.js | 2 +
test/unicode-loading.test.js | 66 +-
test/vector-tile.composite.test.js | 168 +-
test/vector-tile.query.test.js | 124 +-
test/vector-tile.queryMany.test.js | 103 +-
test/vector-tile.test.js | 515 +++++-
151 files changed, 9842 insertions(+), 3426 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git
More information about the Pkg-javascript-commits
mailing list