[mapnik] 05/13: Merge tag 'upstream/3.0.3+ds'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Aug 25 19:37:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit 620150f8a62d6636533487d42a6946bc6fd300ed
Merge: 8541533 a8ab0b3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 25 20:15:04 2015 +0200
Merge tag 'upstream/3.0.3+ds'
Upstream version 3.0.3+ds
.gitmodules | 2 +
CHANGELOG.md | 61 ++
Makefile | 19 +
SConstruct | 46 +-
benchmark/build.py | 1 +
benchmark/run | 2 +-
benchmark/test_noop_rendering.cpp | 53 +
bootstrap.sh | 3 -
docs/contributing.md | 14 +
include/mapnik/geometry.hpp | 8 +-
include/mapnik/geometry_adapters.hpp | 7 +-
include/mapnik/geometry_fusion_adapted.hpp | 5 +-
include/mapnik/gradient.hpp | 7 +-
include/mapnik/grid/grid_pixfmt.hpp | 26 +-
include/mapnik/image_filter.hpp | 269 ++++-
include/mapnik/image_filter_grammar_impl.hpp | 6 +
include/mapnik/image_filter_types.hpp | 48 +-
include/mapnik/image_null.hpp | 1 -
include/mapnik/image_util_jpeg.hpp | 4 +-
include/mapnik/jpeg_io.hpp | 4 +-
.../json/extract_bounding_box_grammar_impl.hpp | 9 +-
include/mapnik/json/geometry_generator_grammar.hpp | 2 +-
.../json/geometry_generator_grammar_impl.hpp | 8 +
include/mapnik/label_collision_detector.hpp | 10 +-
include/mapnik/memory_datasource.hpp | 1 +
include/mapnik/svg/svg_converter.hpp | 4 +-
include/mapnik/svg/svg_parser.hpp | 7 +-
.../mapnik/svg/svg_parser_exception.hpp | 39 +-
include/mapnik/svg/svg_path_adapter.hpp | 2 +-
include/mapnik/text/face.hpp | 2 +-
include/mapnik/text/glyph_positions.hpp | 3 +-
include/mapnik/text/harfbuzz_shaper.hpp | 5 +
include/mapnik/text/icu_shaper.hpp | 35 +-
include/mapnik/text/itemizer.hpp | 5 +-
include/mapnik/text/placement_finder.hpp | 3 +-
include/mapnik/text/placement_finder_impl.hpp | 18 +-
include/mapnik/text/renderer.hpp | 4 +-
include/mapnik/text/scrptrun.hpp | 6 +-
include/mapnik/text/symbolizer_helpers.hpp | 5 +-
include/mapnik/text/text_line.hpp | 8 +-
include/mapnik/transform_processor.hpp | 13 +-
include/mapnik/util/singleton.hpp | 2 +
include/mapnik/util/spirit_transform_attribute.hpp | 21 +-
include/mapnik/version.hpp | 4 +-
include/mapnik/webp_io.hpp | 22 +-
localize.sh | 1 +
plugins/input/occi/README | 12 -
plugins/input/occi/build.py | 74 --
plugins/input/occi/occi_datasource.cpp | 641 ------------
plugins/input/occi/occi_datasource.hpp | 95 --
plugins/input/occi/occi_featureset.cpp | 516 ----------
plugins/input/occi/occi_featureset.hpp | 77 --
plugins/input/occi/occi_types.cpp | 91 --
plugins/input/occi/occi_types.hpp | 265 -----
plugins/input/occi/spatial_classesh.h | 147 ---
plugins/input/occi/spatial_classesm.cpp | 11 -
plugins/input/occi/spatial_classesm.h | 14 -
plugins/input/occi/spatial_classeso.cpp | 312 ------
plugins/input/occi/spatial_types.typ | 4 -
plugins/input/ogr/ogr_featureset.cpp | 8 +-
plugins/input/ogr/ogr_index_featureset.cpp | 8 +-
plugins/input/osm/basiccurl.cpp | 75 --
plugins/input/osm/basiccurl.h | 40 -
plugins/input/osm/build.py | 69 --
plugins/input/osm/dataset_deliverer.cpp | 66 --
plugins/input/osm/osm.cpp | 230 -----
plugins/input/osm/osm.h | 136 ---
plugins/input/osm/osm_datasource.cpp | 159 ---
plugins/input/osm/osm_datasource.hpp | 73 --
plugins/input/osm/osm_featureset.cpp | 132 ---
plugins/input/osm/osm_featureset.hpp | 72 --
plugins/input/osm/osmparser.cpp | 150 ---
plugins/input/osm/osmparser.h | 54 -
plugins/input/osm/osmtagtypes.h | 50 -
plugins/input/pgraster/pgraster_wkb_reader.cpp | 16 +-
plugins/input/rasterlite/build.py | 71 --
plugins/input/rasterlite/rasterlite_datasource.cpp | 191 ----
plugins/input/rasterlite/rasterlite_datasource.hpp | 66 --
plugins/input/rasterlite/rasterlite_featureset.cpp | 136 ---
plugins/input/rasterlite/rasterlite_featureset.hpp | 71 --
plugins/input/rasterlite/rasterlite_include.hpp | 31 -
src/agg/agg_renderer.cpp | 15 +-
src/agg/process_dot_symbolizer.cpp | 4 +-
src/agg/process_group_symbolizer.cpp | 1 +
src/agg/process_line_pattern_symbolizer.cpp | 1 -
src/agg/process_markers_symbolizer.cpp | 1 -
src/agg/process_shield_symbolizer.cpp | 1 +
src/agg/process_text_symbolizer.cpp | 1 +
src/build.py | 3 +-
src/cairo/process_group_symbolizer.cpp | 1 +
src/cairo/process_text_symbolizer.cpp | 1 +
src/color_factory.cpp | 2 +-
src/gradient.cpp | 47 +-
src/grid/process_group_symbolizer.cpp | 1 +
src/grid/process_shield_symbolizer.cpp | 1 +
src/grid/process_text_symbolizer.cpp | 1 +
src/group/group_symbolizer_helper.cpp | 3 -
src/image_util_jpeg.cpp | 31 +-
src/load_map.cpp | 2 +-
src/marker_cache.cpp | 21 +-
src/memory_datasource.cpp | 4 +-
src/save_map.cpp | 1 -
src/svg/svg_parser.cpp | 1044 ++++++++++----------
src/text/face.cpp | 4 +-
src/text/placement_finder.cpp | 13 +-
src/text/symbolizer_helpers.cpp | 37 +-
test/cleanup.hpp | 8 +-
test/unit/core/copy_move_test.cpp | 1 -
test/unit/core/exceptions_test.cpp | 2 -
test/unit/datasource/geojson.cpp | 122 +++
test/unit/datasource/ogr.cpp | 58 ++
test/unit/imaging/image_filter.cpp | 377 +++++++
test/unit/imaging/image_io_test.cpp | 14 +
test/unit/imaging/image_painted_test.cpp | 2 -
test/unit/run.cpp | 4 +
test/unit/svg/svg_parser_test.cpp | 760 ++++++++++++++
test/unit/text/shaping.cpp | 24 +
test/visual/report.cpp | 30 +
test/visual/report.hpp | 2 +-
test/visual/run.cpp | 3 +-
utils/svg2png/svg2png.cpp | 66 +-
121 files changed, 2709 insertions(+), 4993 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