[mapnik] 02/05: Merge tag 'upstream/3.0.0_rc3+ds'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository mapnik.

commit 65cceac2f2999bb1ca1a885654363468ce0712ec
Merge: f48d829 1a45dd3
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed May 27 18:20:51 2015 +0200

    Merge tag 'upstream/3.0.0_rc3+ds'
    
    Upstream version 3.0.0~rc3+ds
    
    # gpg: Signature faite le mer. 27 mai 2015 18:20:47 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

 .gitignore                                         |   1 +
 Makefile                                           |   6 +-
 SConstruct                                         |  13 +--
 bootstrap.sh                                       |  43 ++++++---
 configure                                          |   2 +-
 deps/agg/build.py                                  |   3 +-
 deps/agg/src/agg_pixfmt_rgba.cpp                   |   1 +
 deps/boost/gil/extension/toolbox/hsl.hpp           |   5 ++
 deps/boost/gil/extension/toolbox/hsv.hpp           |   5 ++
 deps/clipper/build.py                              |   3 +-
 deps/clipper/src/clipper.cpp                       |   4 +-
 include/mapnik/geometry_strategy.hpp               |  48 +---------
 include/mapnik/grid/grid.hpp                       |  40 ++++-----
 include/mapnik/image_filter.hpp                    |   1 +
 include/mapnik/json/feature_parser.hpp             |   2 +-
 include/mapnik/json/generic_json.hpp               |   4 +-
 include/mapnik/json/geometry_parser.hpp            |   2 +-
 include/mapnik/json/topojson_grammar.hpp           |   2 +-
 include/mapnik/proj_strategy.hpp                   |  48 +---------
 include/mapnik/util/file_io.hpp                    |   2 +-
 include/mapnik/view_strategy.hpp                   |   4 +-
 include/mapnik/webp_io.hpp                         |  14 +--
 plugins/input/geojson/geojson_datasource.cpp       |   8 +-
 plugins/input/geojson/geojson_datasource.hpp       |   3 -
 plugins/input/geojson/large_geojson_featureset.cpp |   2 +-
 plugins/input/rasterlite/rasterlite_featureset.cpp |   1 -
 plugins/input/topojson/topojson_datasource.cpp     |  12 +--
 plugins/input/topojson/topojson_datasource.hpp     |   6 +-
 src/build.py                                       |   3 +
 src/grid/grid.cpp                                  |   2 +-
 src/json/build.py                                  |   3 +-
 src/wkt/build.py                                   |   3 +-
 test/build.py                                      |  10 ++-
 test/run                                           |  46 ++++++----
 test/unit/font/fontset_runtime_test.cpp            |   4 -
 test/unit/geometry/geometry.cpp                    |   8 +-
 test/unit/geometry/geometry_strategy_test.cpp      |  54 +----------
 test/unit/imaging/webp_io.cpp                      |  26 ++++++
 test/visual/renderer.hpp                           | 100 +++++++++++++++++++--
 test/visual/run.cpp                                |  44 ++++++++-
 test/visual/runner.cpp                             |  12 ++-
 test/visual/runner.hpp                             |  11 ++-
 utils/mapnik-config/build.py                       |   2 +-
 43 files changed, 333 insertions(+), 280 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git