[mapnik] branch master updated (6ba0d90 -> 7e652fb)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Apr 2 01:09:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository mapnik.
from 6ba0d90 Set distribution to unstable.
new d34dadb Imported Upstream version 3.0.11+ds
new 912b646 Merge tag 'upstream/3.0.11+ds'
new 3d5f0db New upstream release.
new 0f1eff5 Drop refactor-markers_placement_finder.patch, applied upstream.
new 7e652fb Set distribution to unstable.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 60 +-
CHANGELOG.md | 11 +
Makefile | 15 +-
SConstruct | 16 +-
appveyor.yml | 14 +-
benchmark/bench_framework.hpp | 117 ++-
benchmark/compare_images.hpp | 15 +-
benchmark/run | 13 +-
benchmark/test_getline.cpp | 6 +-
bootstrap.sh | 10 +-
circle.yml | 49 ++
debian/changelog | 8 +
debian/patches/initialize-typo.patch | 2 +-
debian/patches/occurred-typo.patch | 2 +-
.../refactor-markers_placement_finder.patch | 693 ---------------
debian/patches/series | 1 -
include/mapnik/agg_helpers.hpp | 4 +-
include/mapnik/agg_pattern_source.hpp | 4 +-
include/mapnik/agg_rasterizer.hpp | 5 +-
include/mapnik/agg_render_marker.hpp | 4 +-
include/mapnik/box2d.hpp | 18 +-
include/mapnik/cairo/cairo_context.hpp | 12 +-
include/mapnik/color.hpp | 4 +-
include/mapnik/coord.hpp | 4 +-
include/mapnik/css_color_grammar.hpp | 244 +-----
include/mapnik/css_color_grammar_impl.hpp | 230 +++++
include/mapnik/csv/csv_grammar.hpp | 44 +-
.../mapnik/csv/csv_grammar_impl.hpp | 55 +-
.../{color_factory.hpp => csv/csv_types.hpp} | 15 +-
include/mapnik/expression_grammar.hpp | 75 +-
include/mapnik/expression_grammar_impl.hpp | 71 +-
include/mapnik/expression_node.hpp | 2 +
include/mapnik/feature_kv_iterator.hpp | 4 +-
include/mapnik/feature_type_style.hpp | 4 +-
include/mapnik/global.hpp | 16 +-
include/mapnik/gradient.hpp | 4 +-
include/mapnik/grid/grid_rasterizer.hpp | 4 +
include/mapnik/grid/grid_render_marker.hpp | 5 +-
include/mapnik/grid/grid_renderer_base.hpp | 6 +-
include/mapnik/grid/grid_rendering_buffer.hpp | 4 +
include/mapnik/hextree.hpp | 26 +-
include/mapnik/image_compositing.hpp | 4 +-
include/mapnik/image_filter.hpp | 5 +-
include/mapnik/image_filter_grammar.hpp | 9 +-
include/mapnik/image_filter_grammar_impl.hpp | 3 +
include/mapnik/image_options.hpp | 5 +
include/mapnik/image_reader.hpp | 6 +-
include/mapnik/image_scaling.hpp | 5 +-
include/mapnik/image_scaling_traits.hpp | 4 +-
include/mapnik/json/error_handler.hpp | 9 +-
.../mapnik/json/extract_bounding_box_grammar.hpp | 62 +-
.../json/extract_bounding_box_grammar_impl.hpp | 50 +-
include/mapnik/json/feature_grammar.hpp | 9 +-
include/mapnik/json/geometry_generator_grammar.hpp | 2 +-
.../json/geometry_generator_grammar_impl.hpp | 1 +
include/mapnik/json/geometry_grammar.hpp | 4 +-
include/mapnik/json/geometry_grammar_impl.hpp | 6 +-
include/mapnik/json/geometry_parser.hpp | 18 +-
include/mapnik/json/geometry_util.hpp | 1 +
.../{path_expression.hpp => json/positions.hpp} | 26 +-
include/mapnik/json/positions_grammar.hpp | 12 +-
include/mapnik/json/positions_grammar_impl.hpp | 2 +-
.../mapnik/json/properties_generator_grammar.hpp | 13 +-
include/mapnik/json/symbolizer_grammar.hpp | 216 -----
include/mapnik/json/topojson_grammar.hpp | 8 +-
include/mapnik/json/topojson_grammar_impl.hpp | 115 ++-
include/mapnik/json/topojson_utils.hpp | 368 +++++++-
include/mapnik/json/topology.hpp | 73 --
include/mapnik/label_collision_detector.hpp | 4 +-
include/mapnik/map.hpp | 4 +-
include/mapnik/mapped_memory_cache.hpp | 5 +
include/mapnik/marker.hpp | 4 +-
include/mapnik/marker_helpers.hpp | 96 +--
include/mapnik/markers_placement.hpp | 118 ++-
include/mapnik/markers_placements/basic.hpp | 104 +++
include/mapnik/markers_placements/interior.hpp | 24 +-
include/mapnik/markers_placements/line.hpp | 30 +-
include/mapnik/markers_placements/point.hpp | 123 +--
.../mapnik/markers_placements/vertext_first.hpp | 24 +-
include/mapnik/markers_placements/vertext_last.hpp | 21 +-
include/mapnik/params.hpp | 5 +-
include/mapnik/path_expression_grammar_impl.hpp | 5 +-
include/mapnik/png_io.hpp | 28 +-
include/mapnik/projection.hpp | 4 +-
include/mapnik/ptree_helpers.hpp | 4 +-
include/mapnik/quad_tree.hpp | 80 +-
include/mapnik/raster.hpp | 5 +-
include/mapnik/raster_colorizer.hpp | 11 +-
.../renderer_common/process_raster_symbolizer.hpp | 4 +-
include/mapnik/simplify.hpp | 4 +-
include/mapnik/simplify_converter.hpp | 2 +-
include/mapnik/span_image_filter.hpp | 45 +-
.../mapnik/stringify_macro.hpp | 10 +-
include/mapnik/svg/geometry_svg_generator.hpp | 6 +-
include/mapnik/svg/output/svg_output_grammars.hpp | 45 -
.../mapnik/svg/output/svg_output_grammars_impl.hpp | 45 +
include/mapnik/svg/svg_converter.hpp | 4 +-
include/mapnik/svg/svg_path_adapter.hpp | 4 +-
include/mapnik/svg/svg_path_attributes.hpp | 12 +-
include/mapnik/svg/svg_path_commands.hpp | 223 ++---
include/mapnik/svg/svg_path_grammar.hpp | 135 +--
include/mapnik/svg/svg_path_grammar_impl.hpp | 112 +++
include/mapnik/svg/svg_path_parser.hpp | 28 +-
include/mapnik/svg/svg_points_grammar.hpp | 50 +-
...nts_grammar.hpp => svg_points_grammar_impl.hpp} | 65 +-
include/mapnik/svg/svg_renderer_agg.hpp | 4 +-
include/mapnik/svg/svg_transform_grammar.hpp | 247 +-----
include/mapnik/svg/svg_transform_grammar_impl.hpp | 172 ++++
include/mapnik/symbolizer.hpp | 4 +-
include/mapnik/text/face.hpp | 6 +-
include/mapnik/text/font_feature_settings.hpp | 8 +-
include/mapnik/text/formatting/layout.hpp | 3 +
include/mapnik/text/glyph_positions.hpp | 4 +-
include/mapnik/text/harfbuzz_shaper.hpp | 6 +-
include/mapnik/text/icu_shaper.hpp | 5 +-
include/mapnik/text/itemizer.hpp | 4 +-
include/mapnik/text/properties_util.hpp | 7 +-
include/mapnik/text/renderer.hpp | 7 +-
include/mapnik/text/scrptrun.hpp | 3 +
include/mapnik/text/symbolizer_helpers.hpp | 2 +-
include/mapnik/text/text_properties.hpp | 4 +-
include/mapnik/tiff_io.hpp | 6 +
include/mapnik/transform_expression.hpp | 6 +-
include/mapnik/transform_processor.hpp | 5 +-
include/mapnik/unicode.hpp | 4 +
include/mapnik/util/const_rendering_buffer.hpp | 3 +
include/mapnik/util/file_io.hpp | 7 +-
include/mapnik/util/geometry_to_ds_type.hpp | 7 +-
include/mapnik/util/geometry_to_geojson.hpp | 11 +-
include/mapnik/util/path_iterator.hpp | 5 +-
include/mapnik/util/spatial_index.hpp | 41 +-
include/mapnik/util/variant.hpp | 6 +-
include/mapnik/value.hpp | 920 +-------------------
include/mapnik/value_hash.hpp | 4 +-
include/mapnik/value_types.hpp | 5 +-
include/mapnik/version.hpp | 9 +-
include/mapnik/vertex_adapters.hpp | 185 +---
include/mapnik/vertex_cache.hpp | 4 +-
include/mapnik/vertex_converters.hpp | 6 +-
include/mapnik/warning_ignore.hpp | 23 +-
.../{warning_ignore.hpp => warning_ignore_agg.hpp} | 13 +-
include/mapnik/well_known_srs.hpp | 7 +-
include/mapnik/wkb.hpp | 8 +-
include/mapnik/wkt/wkt_generator_grammar.hpp | 1 -
include/mapnik/wkt/wkt_generator_grammar_impl.hpp | 8 +-
include/mapnik/wkt/wkt_grammar.hpp | 3 +-
include/mapnik/wkt/wkt_grammar_impl.hpp | 6 +-
include/mapnik/xml_node.hpp | 4 +-
mason_latest.sh | 37 +-
plugins/input/csv/build.py | 1 +
plugins/input/csv/csv_datasource.cpp | 348 ++------
plugins/input/csv/csv_datasource.hpp | 23 +-
plugins/input/csv/csv_featureset.cpp | 6 +-
plugins/input/csv/csv_featureset.hpp | 5 +-
plugins/input/csv/csv_getline.hpp | 72 ++
plugins/input/csv/csv_index_featureset.cpp | 6 +-
plugins/input/csv/csv_index_featureset.hpp | 4 +-
plugins/input/csv/csv_inline_featureset.cpp | 6 +-
plugins/input/csv/csv_inline_featureset.hpp | 5 +-
plugins/input/csv/csv_utils.cpp | 507 +++++++++++
plugins/input/csv/csv_utils.hpp | 321 +------
plugins/input/gdal/gdal_datasource.cpp | 41 +-
plugins/input/gdal/gdal_datasource.hpp | 3 +-
plugins/input/gdal/gdal_featureset.cpp | 7 +-
plugins/input/gdal/gdal_featureset.hpp | 5 +-
plugins/input/geojson/geojson_datasource.cpp | 14 +-
plugins/input/geojson/geojson_index_featureset.cpp | 1 -
.../geojson/geojson_memory_index_featureset.cpp | 1 -
plugins/input/pgraster/pgraster_wkb_reader.cpp | 15 +-
plugins/input/postgis/postgis_datasource.cpp | 113 ++-
plugins/input/postgis/postgis_datasource.hpp | 7 +
plugins/input/postgis/postgis_featureset.cpp | 16 +-
plugins/input/postgis/postgis_featureset.hpp | 4 +-
plugins/input/topojson/topojson_datasource.cpp | 2 +-
plugins/input/topojson/topojson_featureset.cpp | 335 +-------
scripts/build-appveyor.bat | 6 +-
scripts/travis-common.sh | 41 +-
src/agg/agg_renderer.cpp | 9 +-
src/agg/process_building_symbolizer.cpp | 5 +-
src/agg/process_debug_symbolizer.cpp | 4 +-
src/agg/process_dot_symbolizer.cpp | 4 +-
src/agg/process_group_symbolizer.cpp | 4 +-
src/agg/process_line_pattern_symbolizer.cpp | 6 +-
src/agg/process_line_symbolizer.cpp | 5 +-
src/agg/process_markers_symbolizer.cpp | 4 +-
src/agg/process_point_symbolizer.cpp | 4 +-
src/agg/process_polygon_pattern_symbolizer.cpp | 5 +-
src/agg/process_polygon_symbolizer.cpp | 5 +-
src/agg/process_raster_symbolizer.cpp | 4 +-
src/box2d.cpp | 50 +-
src/build.py | 7 +
src/cairo/process_polygon_pattern_symbolizer.cpp | 3 +-
src/debug.cpp | 10 +-
src/feature_kv_iterator.cpp | 4 +
src/font_engine_freetype.cpp | 18 +-
src/fs.cpp | 5 +-
src/grid/grid_renderer.cpp | 8 +-
src/grid/process_building_symbolizer.cpp | 4 +-
src/grid/process_group_symbolizer.cpp | 4 +-
src/grid/process_line_pattern_symbolizer.cpp | 5 +-
src/grid/process_line_symbolizer.cpp | 5 +-
src/grid/process_markers_symbolizer.cpp | 4 +-
src/grid/process_point_symbolizer.cpp | 4 +-
src/grid/process_polygon_pattern_symbolizer.cpp | 11 +-
src/grid/process_polygon_symbolizer.cpp | 4 +-
src/grid/process_shield_symbolizer.cpp | 5 +-
src/image_compositing.cpp | 5 +-
src/image_scaling.cpp | 5 +-
src/image_util.cpp | 5 +-
.../json/mapnik_geometry_to_geojson.cpp | 9 +-
.../json/mapnik_json_geometry_parser.cpp | 12 +-
...ammar.cpp => mapnik_json_positions_grammar.cpp} | 4 +-
src/load_map.cpp | 8 +-
src/map.cpp | 2 +-
src/marker_cache.cpp | 4 +-
src/marker_helpers.cpp | 141 ++++
src/palette.cpp | 10 +-
src/plugin.cpp | 2 +
src/rapidxml_loader.cpp | 6 +-
src/raster_colorizer.cpp | 2 +-
src/renderer_common/render_markers_symbolizer.cpp | 232 +++---
src/renderer_common/render_pattern.cpp | 3 +
src/svg/svg_parser.cpp | 6 +-
src/svg/svg_path_parser.cpp | 43 +-
src/svg/svg_points_parser.cpp | 33 +-
src/svg/svg_transform_parser.cpp | 37 +-
src/text/face.cpp | 9 +-
src/text/font_library.cpp | 5 +
src/text/formatting/format.cpp | 4 +-
src/text/formatting/layout.cpp | 4 +-
src/text/formatting/list.cpp | 4 +-
src/text/formatting/text.cpp | 4 +-
src/text/placements/list.cpp | 4 +-
src/text/scrptrun.cpp | 3 +
src/text/text_layout.cpp | 5 +-
src/text/text_properties.cpp | 4 +-
src/twkb.cpp | 387 +++++++++
src/unicode.cpp | 12 +-
src/value.cpp | 928 +++++++++++++++++++++
src/vertex_adapters.cpp | 213 +++++
src/warp.cpp | 4 +-
src/well_known_srs.cpp | 4 +-
src/wkb.cpp | 22 +-
test/build.py | 2 +
test/cleanup.hpp | 5 +
test/run | 32 +-
test/unit/color/css_color.cpp | 1 +
test/unit/core/box2d_test.cpp | 1 +
test/unit/core/comparison_test.cpp | 1 +
test/unit/core/conversions_test.cpp | 1 +
test/unit/core/exceptions_test.cpp | 1 +
test/unit/core/expressions_test.cpp | 8 +
test/unit/core/params_test.cpp | 1 +
test/unit/core/value_test.cpp | 1 +
test/unit/data/well-known-geometries.test | 13 +
test/unit/datasource/csv.cpp | 37 +-
test/unit/datasource/ds_test_util.hpp | 25 +
test/unit/datasource/geojson.cpp | 19 -
test/unit/datasource/topojson.cpp | 75 ++
test/unit/font/fontset_runtime_test.cpp | 1 +
test/unit/geometry/centroid.cpp | 1 +
test/unit/geometry/geometry.cpp | 6 +-
test/unit/geometry/geometry_envelope_test.cpp | 1 +
test/unit/geometry/geometry_equal.hpp | 6 +
test/unit/geometry/geometry_hit_test.cpp | 1 +
test/unit/geometry/geometry_is_simple.cpp | 1 +
test/unit/geometry/geometry_is_valid.cpp | 1 +
test/unit/geometry/geometry_reprojection.cpp | 1 +
test/unit/geometry/geometry_strategy_test.cpp | 1 +
test/unit/geometry/has_empty.cpp | 1 +
test/unit/geometry/is_empty.cpp | 1 +
test/unit/geometry/remove_empty.cpp | 1 +
test/unit/imaging/image.cpp | 1 +
test/unit/imaging/image_apply_opacity.cpp | 1 +
test/unit/imaging/image_filter.cpp | 1 +
test/unit/imaging/image_io_test.cpp | 33 +-
test/unit/imaging/image_is_solid.cpp | 1 +
test/unit/imaging/image_painted_test.cpp | 1 +
test/unit/imaging/image_premultiply.cpp | 1 +
test/unit/imaging/image_set_pixel.cpp | 1 +
test/unit/imaging/image_view.cpp | 1 +
test/unit/numerics/enumeration.cpp | 1 +
test/unit/numerics/safe_cast.cpp | 1 +
test/unit/pixel/agg_blend_src_over_test.cpp | 1 +
test/unit/pixel/palette.cpp | 1 +
test/unit/projection/proj_transform.cpp | 1 +
.../unit/serialization/parse_hex.hpp | 26 +-
test/unit/serialization/wkb_formats_test.cpp | 5 -
test/unit/serialization/wkb_test.cpp | 113 +++
test/unit/serialization/xml_parser_trim.cpp | 1 +
test/unit/svg/svg_parser_test.cpp | 4 +-
test/unit/svg/svg_path_parser_test.cpp | 2 +-
test/unit/svg/util.hpp | 2 +-
test/unit/symbolizer/symbolizer_test.cpp | 1 +
test/unit/text/shaping.cpp | 1 +
test/unit/vertex_adapter/clipping_test.cpp | 1 +
test/unit/vertex_adapter/line_offset_test.cpp | 1 +
test/unit/vertex_adapter/offset_converter.cpp | 1 +
.../vertex_adapter/simplify_converters_test.cpp | 1 +
test/unit/vertex_adapter/vertex_adapter.cpp | 1 +
utils/mapnik-config/build.py | 5 -
utils/mapnik-index/build.py | 5 +-
utils/mapnik-index/mapnik-index.cpp | 10 +-
utils/mapnik-index/process_csv_file.cpp | 191 +----
utils/mapnik-index/process_csv_file.hpp | 2 +-
utils/mapnik-index/process_geojson_file.cpp | 36 +-
utils/mapnik-index/process_geojson_file.hpp | 2 +-
utils/pgsql2sqlite/main.cpp | 7 +-
utils/pgsql2sqlite/sqlite.hpp | 5 +-
utils/shapeindex/build.py | 4 +-
utils/shapeindex/shapeindex.cpp | 15 +-
utils/svg2png/svg2png.cpp | 4 +
312 files changed, 5838 insertions(+), 5465 deletions(-)
mode change 100644 => 100755 bootstrap.sh
create mode 100644 circle.yml
delete mode 100644 debian/patches/refactor-markers_placement_finder.patch
copy src/parse_transform.cpp => include/mapnik/csv/csv_grammar_impl.hpp (51%)
copy include/mapnik/{color_factory.hpp => csv/csv_types.hpp} (82%)
copy include/mapnik/{path_expression.hpp => json/positions.hpp} (71%)
delete mode 100644 include/mapnik/json/symbolizer_grammar.hpp
create mode 100644 include/mapnik/markers_placements/basic.hpp
copy src/transform_expression_grammar.cpp => include/mapnik/stringify_macro.hpp (83%)
create mode 100644 include/mapnik/svg/svg_path_grammar_impl.hpp
copy include/mapnik/svg/{svg_points_grammar.hpp => svg_points_grammar_impl.hpp} (54%)
create mode 100644 include/mapnik/svg/svg_transform_grammar_impl.hpp
copy include/mapnik/{warning_ignore.hpp => warning_ignore_agg.hpp} (77%)
create mode 100644 plugins/input/csv/csv_getline.hpp
create mode 100644 plugins/input/csv/csv_utils.cpp
copy include/mapnik/util/geometry_to_geojson.hpp => src/json/mapnik_geometry_to_geojson.cpp (86%)
copy include/mapnik/json/geometry_parser.hpp => src/json/mapnik_json_geometry_parser.cpp (84%)
copy src/json/{mapnik_json_geometry_grammar.cpp => mapnik_json_positions_grammar.cpp} (90%)
create mode 100644 src/twkb.cpp
create mode 100644 src/value.cpp
create mode 100644 src/vertex_adapters.cpp
create mode 100644 test/unit/data/well-known-geometries.test
create mode 100644 test/unit/datasource/topojson.cpp
copy include/mapnik/util/feature_to_geojson.hpp => test/unit/serialization/parse_hex.hpp (64%)
create mode 100644 test/unit/serialization/wkb_test.cpp
--
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