This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit da5f897a3682a35c679aeaa45f8b8401e14af7f0 Merge: 21f06ce f4e16e9 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Sep 20 11:57:42 2015 +0200 Merge tag 'upstream/3.0.5+ds' Upstream version 3.0.5+ds .gitignore | 1 + CHANGELOG.md | 21 + benchmark/data/polygon_rendering_clip.xml | 2 +- benchmark/data/polygon_rendering_no_clip.xml | 2 +- benchmark/data/roads.xml | 2 +- benchmark/test_array_allocation.cpp | 29 +- benchmark/test_expression_parse.cpp | 2 +- benchmark/test_numeric_cast_vs_static_cast.cpp | 7 +- benchmark/test_offset_converter.cpp | 5 +- benchmark/test_polygon_clipping.cpp | 9 +- benchmark/test_polygon_clipping_rendering.cpp | 11 +- benchmark/test_proj_transform1.cpp | 10 +- benchmark/test_rendering.cpp | 5 +- benchmark/test_rendering_shared_map.cpp | 5 +- benchmark/test_utf_encoding.cpp | 8 +- include/mapnik/csv/csv_grammar.hpp | 2 +- include/mapnik/debug.hpp | 447 +++++++++++---------- include/mapnik/image.hpp | 31 +- include/mapnik/image_filter.hpp | 13 +- include/mapnik/image_filter_types.hpp | 15 +- include/mapnik/image_impl.hpp | 39 +- include/mapnik/json/topojson_grammar_impl.hpp | 2 +- include/mapnik/json/topojson_utils.hpp | 6 - include/mapnik/json/topology.hpp | 5 +- .../renderer_common/process_markers_symbolizer.hpp | 6 +- .../renderer_common/process_polygon_symbolizer.hpp | 2 +- include/mapnik/text/placement_finder.hpp | 2 +- include/mapnik/util/singleton.hpp | 4 +- include/mapnik/version.hpp | 3 +- plugins/input/csv/build.py | 79 ++-- plugins/input/csv/csv_datasource.cpp | 98 +++-- plugins/input/csv/csv_datasource.hpp | 4 +- plugins/input/csv/csv_featureset.cpp | 22 +- plugins/input/csv/csv_featureset.hpp | 14 +- plugins/input/csv/csv_utils.hpp | 8 +- plugins/input/topojson/topojson_datasource.cpp | 13 +- src/agg/process_line_pattern_symbolizer.cpp | 4 +- src/agg/process_polygon_pattern_symbolizer.cpp | 4 +- src/cairo/process_line_pattern_symbolizer.cpp | 2 +- src/cairo/process_polygon_pattern_symbolizer.cpp | 2 +- src/debug.cpp | 50 +-- src/grid/process_line_pattern_symbolizer.cpp | 2 +- src/grid/process_polygon_pattern_symbolizer.cpp | 2 +- src/image.cpp | 39 +- src/svg/svg_parser.cpp | 5 + src/text/placement_finder.cpp | 2 + src/text/symbolizer_helpers.cpp | 16 +- src/unicode.cpp | 2 +- test/standalone/csv_test.cpp | 1 + test/unit/imaging/image.cpp | 106 ++++- test/unit/imaging/image_filter.cpp | 92 ++++- test/unit/imaging/image_io_test.cpp | 5 + 52 files changed, 767 insertions(+), 501 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel