[mapnik] 02/05: Merge tag 'upstream/3.0.9_rc2+ds'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Nov 11 08:48:20 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 76187953030365a2149e31a4904985ae3fd49461
Merge: 6d32eb9 ebc6f3c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Nov 11 00:06:15 2015 +0100
Merge tag 'upstream/3.0.9_rc2+ds'
Upstream version 3.0.9~rc2+ds
AUTHORS.md | 1 +
CHANGELOG.md | 10 +++
CODE_OF_CONDUCT.md | 22 ++++++
README.md | 4 +
SConstruct | 26 +++++--
docs/contributing.md | 8 ++
include/mapnik/attribute_collector.hpp | 6 +-
include/mapnik/css_color_grammar.hpp | 6 +-
include/mapnik/expression_grammar.hpp | 10 +--
include/mapnik/expression_grammar_impl.hpp | 8 +-
include/mapnik/geometry_adapters.hpp | 6 +-
include/mapnik/geometry_correct.hpp | 7 +-
include/mapnik/grid/grid_pixfmt.hpp | 4 +-
include/mapnik/grid/grid_renderer_base.hpp | 4 +-
include/mapnik/image_filter.hpp | 8 +-
include/mapnik/image_filter_grammar.hpp | 7 +-
include/mapnik/image_filter_grammar_impl.hpp | 3 +-
include/mapnik/image_util.hpp | 7 +-
include/mapnik/json/error_handler.hpp | 2 +-
.../mapnik/json/extract_bounding_box_grammar.hpp | 8 +-
include/mapnik/json/feature_grammar.hpp | 9 +--
include/mapnik/json/feature_grammar_impl.hpp | 35 +++++----
include/mapnik/json/generic_json.hpp | 6 +-
include/mapnik/json/geometry_generator_grammar.hpp | 6 +-
.../json/geometry_generator_grammar_impl.hpp | 6 +-
include/mapnik/json/geometry_grammar.hpp | 2 +-
include/mapnik/json/geometry_grammar_impl.hpp | 23 +++---
include/mapnik/json/positions_grammar.hpp | 12 +--
include/mapnik/json/positions_grammar_impl.hpp | 5 +-
.../mapnik/json/properties_generator_grammar.hpp | 7 +-
include/mapnik/json/topojson_grammar.hpp | 7 +-
include/mapnik/json/topology.hpp | 2 +-
include/mapnik/offset_converter.hpp | 90 +++++++++++++++++-----
include/mapnik/palette.hpp | 2 +-
include/mapnik/params_impl.hpp | 7 +-
include/mapnik/path_expression_grammar.hpp | 7 +-
include/mapnik/proj_strategy.hpp | 6 +-
include/mapnik/sql_utils.hpp | 6 +-
include/mapnik/svg/geometry_svg_generator.hpp | 7 +-
include/mapnik/svg/output/svg_output_grammars.hpp | 7 +-
.../mapnik/svg/output/svg_output_grammars_impl.hpp | 7 +-
include/mapnik/svg/svg_path_commands.hpp | 8 +-
include/mapnik/svg/svg_points_grammar.hpp | 5 +-
include/mapnik/svg/svg_renderer_agg.hpp | 4 +-
include/mapnik/svg/svg_transform_grammar.hpp | 7 +-
include/mapnik/text/harfbuzz_shaper.hpp | 49 +++++++++---
include/mapnik/util/container_adapter.hpp | 8 +-
include/mapnik/util/spirit_transform_attribute.hpp | 7 +-
include/mapnik/version.hpp | 2 +-
.../grid_renderer_base.hpp => warning_ignore.hpp} | 31 +++-----
include/mapnik/webp_io.hpp | 3 +-
include/mapnik/wkt/wkt_generator_grammar.hpp | 7 +-
include/mapnik/wkt/wkt_grammar.hpp | 7 +-
include/mapnik/xml_attribute_cast.hpp | 3 +-
plugins/input/csv/csv_datasource.cpp | 3 +-
plugins/input/csv/csv_datasource.hpp | 11 +--
plugins/input/csv/csv_featureset.hpp | 3 +-
plugins/input/csv/csv_index_featureset.hpp | 3 +-
plugins/input/csv/csv_utils.hpp | 6 +-
plugins/input/geojson/geojson_datasource.cpp | 11 +--
plugins/input/geojson/geojson_datasource.hpp | 10 +--
plugins/input/geojson/geojson_index_featureset.hpp | 3 +-
plugins/input/ogr/ogr_datasource.cpp | 4 +-
plugins/input/ogr/ogr_datasource.hpp | 3 +-
plugins/input/ogr/ogr_featureset.hpp | 3 +-
plugins/input/ogr/ogr_index_featureset.cpp | 3 +-
plugins/input/pgraster/pgraster_datasource.cpp | 4 +-
plugins/input/postgis/postgis_datasource.cpp | 4 +-
plugins/input/raster/raster_featureset.cpp | 4 +-
plugins/input/shape/dbfile.cpp | 7 +-
plugins/input/shape/dbfile.hpp | 3 +-
plugins/input/shape/shape_datasource.cpp | 6 +-
plugins/input/shape/shape_index_featureset.cpp | 5 +-
plugins/input/shape/shape_utils.cpp | 4 +-
plugins/input/shape/shapefile.hpp | 4 +-
plugins/input/sqlite/sqlite_connection.hpp | 4 +-
plugins/input/sqlite/sqlite_utils.hpp | 4 +-
plugins/input/topojson/topojson_datasource.hpp | 11 +--
plugins/input/topojson/topojson_featureset.cpp | 5 +-
src/box2d.cpp | 8 +-
src/color.cpp | 7 +-
src/conversions.cpp | 6 +-
src/dasharray_parser.cpp | 5 +-
src/datasource_cache.cpp | 4 +-
src/expression_node.cpp | 2 +-
src/font_engine_freetype.cpp | 4 +-
src/image_compositing.cpp | 6 +-
src/image_filter_types.cpp | 8 +-
src/image_options.cpp | 6 +-
src/image_scaling.cpp | 5 +-
src/jpeg_reader.cpp | 3 +-
src/mapped_memory_cache.cpp | 6 +-
src/marker_cache.cpp | 4 +-
src/miniz_png.cpp | 3 +-
src/png_reader.cpp | 4 +-
src/save_map.cpp | 6 +-
src/simplify.cpp | 6 +-
src/svg/output/svg_generator.cpp | 7 +-
src/svg/svg_parser.cpp | 5 +-
src/text/font_feature_settings.cpp | 7 +-
src/text/placements/simple.cpp | 8 +-
src/tiff_reader.cpp | 3 +-
src/webp_reader.cpp | 8 +-
test/unit/datasource/csv.cpp | 43 +++++++----
test/unit/datasource/geojson.cpp | 47 ++++++++++-
test/unit/geometry/geometry_equal.hpp | 3 +-
test/unit/vertex_adapter/clipping_test.cpp | 5 +-
test/unit/vertex_adapter/offset_converter.cpp | 6 +-
test/visual/map_sizes_grammar.hpp | 7 +-
utils/mapnik-index/build.py | 2 +
utils/mapnik-index/mapnik-index.cpp | 4 +-
utils/mapnik-index/process_csv_file.cpp | 3 +-
utils/mapnik-index/process_geojson_file.cpp | 7 +-
utils/mapnik-render/mapnik-render.cpp | 3 +-
utils/pgsql2sqlite/pgsql2sqlite.hpp | 4 +-
utils/shapeindex/shapeindex.cpp | 3 +-
utils/svg2png/svg2png.cpp | 3 +-
117 files changed, 434 insertions(+), 522 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