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

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit a248d4f2a539170cc0c6c6cb6f4df50909b86192
Merge: cf91821 2108614
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 30 13:38:04 2015 +0200

    Merge tag 'upstream/3.0.4+ds'
    
    Upstream version 3.0.4+ds

 .travis.yml                                        |   12 +-
 CHANGELOG.md                                       |   54 +-
 benchmark/test_polygon_clipping.cpp                |   20 +-
 include/build.py                                   |    1 +
 include/mapnik/csv/csv_grammar.hpp                 |  103 ++
 include/mapnik/datasource_cache.hpp                |    6 +
 include/mapnik/marker_helpers.hpp                  |    1 -
 include/mapnik/value.hpp                           |    6 +
 include/mapnik/version.hpp                         |    2 +-
 plugins/input/csv/build.py                         |    2 +
 plugins/input/csv/csv_datasource.cpp               |  838 ++++---------
 plugins/input/csv/csv_datasource.hpp               |   43 +-
 .../csv_featureset.cpp}                            |   62 +-
 .../csv_featureset.hpp}                            |   40 +-
 plugins/input/csv/csv_inline_featureset.cpp        |   78 ++
 .../csv_inline_featureset.hpp}                     |   41 +-
 plugins/input/csv/csv_utils.hpp                    |  297 ++++-
 plugins/input/geojson/large_geojson_featureset.cpp |    1 -
 plugins/input/geojson/large_geojson_featureset.hpp |    2 -
 src/datasource_cache.cpp                           |   14 +-
 src/image_util_jpeg.cpp                            |    2 +-
 test/standalone/csv_test.cpp                       | 1229 ++++++++++----------
 test/standalone/datasource_registration_test.cpp   |   46 +
 test/unit/svg/svg_parser_test.cpp                  |    4 +-
 test/visual/run.cpp                                |    2 +
 test/visual/runner.cpp                             |   52 +-
 test/visual/runner.hpp                             |   11 +-
 27 files changed, 1583 insertions(+), 1386 deletions(-)

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