[mapnik] 03/06: Merge tag 'upstream/3.0.13_rc1+ds'

Bas Couwenberg sebastic at debian.org
Wed Jan 18 23:47:41 UTC 2017


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

sebastic pushed a commit to branch master
in repository mapnik.

commit 6386a64511d3028d99615d3b7ec23acf95711dbe
Merge: cbb5507 6c3d443
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 18 22:49:04 2017 +0100

    Merge tag 'upstream/3.0.13_rc1+ds'
    
    Upstream version 3.0.13~rc1+ds

 .travis.yml                                        |  35 ++++---
 CHANGELOG.md                                       |  24 ++++-
 README.md                                          |   1 -
 bootstrap.sh                                       |   3 +-
 include/mapnik/cxx11_support.hpp                   |  43 ++++++++
 include/mapnik/enumeration.hpp                     |  16 ++-
 include/mapnik/feature_style_processor_impl.hpp    |   5 +-
 include/mapnik/group/group_symbolizer_helper.hpp   |  10 --
 include/mapnik/image_filter.hpp                    |  42 ++++----
 include/mapnik/json/feature_grammar.hpp            |   3 +-
 include/mapnik/json/feature_grammar_impl.hpp       |  18 ++--
 include/mapnik/json/geometry_grammar.hpp           |   1 +
 include/mapnik/json/geometry_grammar_impl.hpp      |  22 +++--
 include/mapnik/json/positions_grammar.hpp          |   2 -
 include/mapnik/offset_converter.hpp                |  10 +-
 .../renderer_common/render_group_symbolizer.hpp    |   4 +-
 include/mapnik/renderer_common/render_thunk.hpp    |   3 +-
 include/mapnik/simplify_converter.hpp              |  12 +--
 include/mapnik/symbolizer_base.hpp                 |  13 +--
 include/mapnik/text/placement_finder.hpp           |   2 -
 include/mapnik/util/variant.hpp                    |  10 +-
 include/mapnik/util/variant_io.hpp                 |   2 +-
 include/mapnik/value.hpp                           |  30 ++----
 include/mapnik/value_hash.hpp                      |  15 +--
 include/mapnik/value_types.hpp                     | 101 ++++---------------
 plugins/input/csv/csv_utils.cpp                    |   8 +-
 plugins/input/geojson/geojson_datasource.cpp       |  28 +++---
 plugins/input/pgraster/pgraster_datasource.cpp     |   4 +-
 scripts/travis-common.sh                           |  11 ++-
 src/agg/agg_renderer.cpp                           |   5 +-
 src/agg/process_line_pattern_symbolizer.cpp        |  78 ++-------------
 src/agg/process_polygon_pattern_symbolizer.cpp     | 110 ++-------------------
 src/group/group_layout_manager.cpp                 |  46 ++++-----
 src/image.cpp                                      |   1 -
 src/image_util_jpeg.cpp                            |   2 -
 src/image_util_png.cpp                             |   4 -
 src/image_util_webp.cpp                            |   2 -
 src/renderer_common/render_group_symbolizer.cpp    |   8 +-
 src/renderer_common/render_thunk_extractor.cpp     |   6 +-
 test/standalone/font_registration_test.cpp         |  36 ++-----
 test/unit/core/conversions_test.cpp                |  15 +--
 test/unit/datasource/geojson.cpp                   |  52 ++++++++++
 utils/mapnik-config/build.py                       |   2 +-
 43 files changed, 358 insertions(+), 487 deletions(-)

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



More information about the Pkg-grass-devel mailing list