[mapnik] branch master updated (485ddfb -> 254217e)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 26 22:40:39 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 485ddfb Disable parallel builds on alpha, hurd-i386 & kfreebsd-* too.
new ff80a3b Imported Upstream version 3.0.10+ds
new 5ee9efc Merge tag 'upstream/3.0.10+ds'
new 7f26040 New upstream release.
new 5465b8a Update copyright years for Artem Pavlenko.
new 9c07b0c Drop 2001_ftemplate-depth.patch, applied upstream.
new 66f1424 Add --shape-index option to shapeindex manpage.
new 1a92307 Add (build) dependency on libmapbox-variant-dev.
new 254217e Drop license & copyright for src/miniz.c, no longer included.
The 8 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:
.gitmodules | 5 +-
.travis.yml | 96 +-
CHANGELOG.md | 43 +-
INSTALL.md | 8 +-
Makefile | 20 +-
README.md | 4 +-
SConstruct | 15 +-
appveyor.yml | 4 +-
benchmark/bench_framework.hpp | 198 +-
benchmark/test_array_allocation.cpp | 98 +-
benchmark/test_numeric_cast_vs_static_cast.cpp | 16 +-
benchmark/test_png_encoding1.cpp | 2 +-
benchmark/test_png_encoding2.cpp | 2 +-
benchmark/test_polygon_clipping_rendering.cpp | 32 +-
benchmark/test_proj_transform1.cpp | 38 +-
bootstrap.sh | 51 +-
debian/changelog | 13 +-
debian/control | 5 +-
debian/copyright | 30 +-
debian/manpages/shapeindex.1 | 3 +
debian/patches/2001_ftemplate-depth.patch | 16 -
debian/patches/series | 1 -
demo/python/rundemo.py | 2 +-
demo/viewer/about_dialog.cpp | 2 +-
demo/viewer/about_dialog.hpp | 2 +-
demo/viewer/info_dialog.cpp | 2 +-
demo/viewer/info_dialog.hpp | 2 +-
demo/viewer/layer_info_dialog.cpp | 2 +-
demo/viewer/layer_info_dialog.hpp | 2 +-
demo/viewer/layerdelegate.cpp | 2 +-
demo/viewer/layerdelegate.hpp | 2 +-
demo/viewer/layerlistmodel.cpp | 2 +-
demo/viewer/layerlistmodel.hpp | 2 +-
demo/viewer/layerwidget.cpp | 2 +-
demo/viewer/layerwidget.hpp | 2 +-
demo/viewer/main.cpp | 2 +-
demo/viewer/mainwindow.cpp | 2 +-
demo/viewer/mainwindow.hpp | 2 +-
demo/viewer/mapwidget.cpp | 2 +-
demo/viewer/mapwidget.hpp | 2 +-
demo/viewer/styles_model.cpp | 2 +-
demo/viewer/styles_model.hpp | 2 +-
deps/agg/include/agg_array.h | 78 +-
deps/agg/include/agg_conv_clip_polygon.h | 4 +-
deps/agg/include/agg_conv_clip_polyline.h | 4 +-
deps/agg/include/agg_rasterizer_cells_aa.h | 0
deps/agg/include/agg_rasterizer_compound_aa.h | 0
deps/agg/include/agg_vcgen_dash.h | 7 +-
deps/mapnik/build.py | 11 +-
include/mapnik/attribute.hpp | 4 +-
include/mapnik/color.hpp | 39 +-
include/mapnik/csv/csv_grammar.hpp | 50 +-
include/mapnik/enumeration.hpp | 83 +-
include/mapnik/expression_evaluator.hpp | 18 +-
include/mapnik/expression_grammar.hpp | 41 +-
include/mapnik/expression_grammar_impl.hpp | 37 +-
include/mapnik/feature.hpp | 8 +-
include/mapnik/font_engine_freetype.hpp | 12 +-
include/mapnik/geometry.hpp | 19 +-
include/mapnik/geometry_envelope_impl.hpp | 23 +-
include/mapnik/geometry_reprojection_impl.hpp | 43 +-
include/mapnik/geometry_unique.hpp | 82 -
include/mapnik/gradient.hpp | 15 +-
include/mapnik/group/group_layout_manager.hpp | 40 +-
include/mapnik/image.hpp | 3 -
include/mapnik/image_any.hpp | 5 +-
include/mapnik/image_filter.hpp | 16 +-
include/mapnik/image_filter_grammar.hpp | 50 +-
include/mapnik/image_filter_grammar_impl.hpp | 143 +-
include/mapnik/image_impl.hpp | 8 -
include/mapnik/image_null.hpp | 4 +-
include/mapnik/image_scaling_traits.hpp | 4 +-
include/mapnik/image_util_jpeg.hpp | 2 +
include/mapnik/image_util_png.hpp | 2 +
include/mapnik/image_view.hpp | 4 -
include/mapnik/image_view_any.hpp | 5 +-
include/mapnik/image_view_impl.hpp | 19 -
include/mapnik/image_view_null.hpp | 2 +-
include/mapnik/json/geometry_grammar.hpp | 2 +
include/mapnik/json/geometry_grammar_impl.hpp | 39 +-
include/mapnik/json/positions_grammar.hpp | 4 +-
include/mapnik/label_collision_detector.hpp | 28 +-
include/mapnik/mapped_memory_cache.hpp | 4 +-
include/mapnik/marker.hpp | 48 +-
include/mapnik/marker_helpers.hpp | 107 +-
include/mapnik/markers_placements/point.hpp | 21 +-
include/mapnik/memory_datasource.hpp | 1 +
include/mapnik/miniz_png.hpp | 95 -
include/mapnik/offset_converter.hpp | 2 -
include/mapnik/params.hpp | 3 +-
include/mapnik/png_io.hpp | 35 +-
include/mapnik/pool.hpp | 1 -
include/mapnik/quad_tree.hpp | 7 +-
include/mapnik/renderer_common.hpp | 16 +-
.../renderer_common/apply_vertex_converter.hpp | 2 +-
.../renderer_common/process_group_symbolizer.hpp | 403 --
.../renderer_common/render_group_symbolizer.hpp | 66 +
.../renderer_common/render_markers_symbolizer.hpp | 76 +
include/mapnik/renderer_common/render_thunk.hpp | 115 +
.../renderer_common/render_thunk_extractor.hpp | 97 +
include/mapnik/simplify_converter.hpp | 12 +-
.../{span_image_filter.h => span_image_filter.hpp} | 2 +
include/mapnik/svg/svg_converter.hpp | 10 +-
include/mapnik/svg/svg_path_adapter.hpp | 2 +-
include/mapnik/svg/svg_path_attributes.hpp | 19 +-
include/mapnik/svg/svg_path_grammar.hpp | 35 +-
include/mapnik/svg/svg_renderer_agg.hpp | 159 +-
include/mapnik/symbolizer.hpp | 6 +-
include/mapnik/symbolizer_base.hpp | 18 +-
include/mapnik/symbolizer_default_values.hpp | 5 +
include/mapnik/symbolizer_utils.hpp | 3 +-
include/mapnik/text/face.hpp | 3 +-
include/mapnik/text/glyph_positions.hpp | 50 +-
include/mapnik/text/renderer.hpp | 27 +
.../mapnik/transform_expression_grammar_impl.hpp | 4 +-
include/mapnik/transform_path_adapter.hpp | 12 +-
include/mapnik/transform_processor.hpp | 14 +-
include/mapnik/util/dasharray_parser.hpp | 23 +-
include/mapnik/util/noncopyable.hpp | 11 +
include/mapnik/util/recursive_wrapper.hpp | 150 -
include/mapnik/util/spatial_index.hpp | 19 +-
include/mapnik/util/variant.hpp | 866 +---
include/mapnik/util/variant_io.hpp | 2 +-
include/mapnik/value.hpp | 667 ++-
include/mapnik/value_hash.hpp | 2 +-
include/mapnik/value_types.hpp | 27 +
include/mapnik/version.hpp | 2 +-
include/mapnik/vertex.hpp | 17 -
include/mapnik/vertex_processor.hpp | 20 +-
include/mapnik/view_transform.hpp | 18 +-
include/mapnik/warning_ignore.hpp | 5 +-
include/mapnik/wkb.hpp | 1 +
localize.sh | 1 +
plugins/input/csv/csv_datasource.cpp | 37 +-
plugins/input/csv/csv_inline_featureset.cpp | 4 +-
plugins/input/csv/csv_utils.hpp | 128 +-
plugins/input/geojson/geojson_datasource.cpp | 78 +-
plugins/input/geojson/geojson_datasource.hpp | 2 +
plugins/input/ogr/ogr_converter.cpp | 3 +
plugins/input/pgraster/build.py | 3 +-
plugins/input/shape/shape_datasource.cpp | 8 +-
plugins/input/shape/shape_index_featureset.cpp | 25 +-
plugins/input/shape/shape_index_featureset.hpp | 19 +-
plugins/input/shape/shape_io.cpp | 79 +
plugins/input/shape/shape_io.hpp | 20 +-
plugins/input/shape/shapefile.hpp | 5 +
scripts/appveyor-system-info.ps1 | 84 +
scripts/build-appveyor.bat | 23 +-
scripts/build-local.bat | 31 +-
scripts/msbuild-force-mp-and-buildinparallel.props | 9 +
scripts/parse-appveyor-yml.ps1 | 7 +
scripts/time-header | 9 +
scripts/travis-common.sh | 109 +
src/agg/agg_renderer.cpp | 12 +-
src/agg/process_debug_symbolizer.cpp | 10 +-
src/agg/process_group_symbolizer.cpp | 73 +-
src/agg/process_line_pattern_symbolizer.cpp | 8 +-
src/agg/process_markers_symbolizer.cpp | 131 +-
src/agg/process_point_symbolizer.cpp | 1 -
src/agg/process_polygon_pattern_symbolizer.cpp | 6 +-
src/build.py | 6 +-
src/cairo/cairo_renderer.cpp | 6 +-
src/cairo/process_group_symbolizer.cpp | 60 +-
src/cairo/process_markers_symbolizer.cpp | 97 +-
src/color.cpp | 86 +-
src/dasharray_parser.cpp | 33 +-
src/datasource_cache.cpp | 4 +-
src/expression_node.cpp | 21 +-
src/font_engine_freetype.cpp | 9 +-
src/geometry_envelope.cpp | 2 +
src/gradient.cpp | 18 -
src/grid/process_group_symbolizer.cpp | 79 +-
src/grid/process_markers_symbolizer.cpp | 149 +-
src/grid/process_point_symbolizer.cpp | 1 -
src/group/group_layout_manager.cpp | 19 +-
src/image_compositing.cpp | 8 +-
src/image_copy.cpp | 8 +-
.../image_filter_grammar.cpp | 21 +-
src/image_filter_types.cpp | 1 -
src/image_util.cpp | 14 +-
src/image_util_png.cpp | 4 +-
src/mapped_memory_cache.cpp | 5 +-
src/marker_cache.cpp | 6 +-
src/memory_datasource.cpp | 28 +-
src/miniz.c | 4834 --------------------
src/miniz_png.cpp | 375 --
src/renderer_common.cpp | 24 +-
src/renderer_common/process_group_symbolizer.cpp | 233 -
src/renderer_common/render_group_symbolizer.cpp | 194 +
.../renderer_common/render_markers_symbolizer.cpp | 90 +-
src/renderer_common/render_thunk_extractor.cpp | 155 +
src/save_map.cpp | 5 +-
src/svg/output/svg_renderer.cpp | 1 -
src/svg/svg_parser.cpp | 135 +-
src/svg/svg_path_parser.cpp | 8 +-
src/text/glyph_positions.cpp | 2 +-
src/text/renderer.cpp | 4 +-
src/tiff_reader.cpp | 8 +-
src/warp.cpp | 4 +-
test/catch.hpp | 3326 ++++++++------
test/catch_ext.hpp | 22 +
test/unit/color/css_color.cpp | 24 +
test/unit/core/box2d_test.cpp | 59 +
test/unit/core/expressions_test.cpp | 183 +
test/unit/core/value_test.cpp | 109 +
test/unit/datasource/csv.cpp | 10 +-
test/unit/datasource/ds_test_util.hpp | 45 +-
test/unit/datasource/geojson.cpp | 46 +-
test/unit/datasource/postgis.cpp | 279 +-
test/unit/datasource/shapeindex.cpp | 114 +-
test/unit/geometry/geometry.cpp | 13 +
test/unit/geometry/geometry_equal.hpp | 20 +-
test/unit/geometry/geometry_is_simple.cpp | 32 +
test/unit/geometry/geometry_is_valid.cpp | 77 +-
test/unit/imaging/image_filter.cpp | 138 +-
test/unit/imaging/image_io_test.cpp | 58 +-
test/unit/numerics/enumeration.cpp | 16 +
test/unit/run.cpp | 60 +-
test/unit/svg/svg_parser_test.cpp | 255 +-
test/unit/svg/svg_path_parser_test.cpp | 164 +
.../image_util_jpeg.hpp => test/unit/svg/util.hpp | 32 +-
test/visual/runner.cpp | 14 +-
utils/mapnik-config/build.py | 2 +-
utils/mapnik-index/mapnik-index.cpp | 2 +-
utils/mapnik-index/process_csv_file.cpp | 27 +-
utils/mapnik-index/process_geojson_file.cpp | 5 +-
utils/mapnik-index/process_geojson_file.hpp | 2 +-
utils/mapnik-render/mapnik-render.cpp | 2 +-
utils/shapeindex/shapeindex.cpp | 127 +-
utils/svg2png/svg2png.cpp | 11 +-
230 files changed, 6920 insertions(+), 11044 deletions(-)
mode change 100755 => 100644 bootstrap.sh
delete mode 100644 debian/patches/2001_ftemplate-depth.patch
mode change 100755 => 100644 deps/agg/include/agg_rasterizer_cells_aa.h
mode change 100755 => 100644 deps/agg/include/agg_rasterizer_compound_aa.h
delete mode 100644 include/mapnik/geometry_unique.hpp
delete mode 100644 include/mapnik/miniz_png.hpp
delete mode 100644 include/mapnik/renderer_common/process_group_symbolizer.hpp
create mode 100644 include/mapnik/renderer_common/render_group_symbolizer.hpp
create mode 100644 include/mapnik/renderer_common/render_markers_symbolizer.hpp
create mode 100644 include/mapnik/renderer_common/render_thunk.hpp
create mode 100644 include/mapnik/renderer_common/render_thunk_extractor.hpp
rename include/mapnik/{span_image_filter.h => span_image_filter.hpp} (99%)
delete mode 100644 include/mapnik/util/recursive_wrapper.hpp
create mode 100644 scripts/appveyor-system-info.ps1
create mode 100644 scripts/msbuild-force-mp-and-buildinparallel.props
create mode 100644 scripts/parse-appveyor-yml.ps1
create mode 100755 scripts/time-header
create mode 100644 scripts/travis-common.sh
copy include/mapnik/color_factory.hpp => src/image_filter_grammar.cpp (76%)
delete mode 100644 src/miniz.c
delete mode 100644 src/miniz_png.cpp
delete mode 100644 src/renderer_common/process_group_symbolizer.cpp
create mode 100644 src/renderer_common/render_group_symbolizer.cpp
rename include/mapnik/renderer_common/process_markers_symbolizer.hpp => src/renderer_common/render_markers_symbolizer.cpp (82%)
create mode 100644 src/renderer_common/render_thunk_extractor.cpp
create mode 100644 test/catch_ext.hpp
create mode 100644 test/unit/core/expressions_test.cpp
create mode 100644 test/unit/core/value_test.cpp
create mode 100644 test/unit/numerics/enumeration.cpp
create mode 100644 test/unit/svg/svg_path_parser_test.cpp
copy include/mapnik/image_util_jpeg.hpp => test/unit/svg/util.hpp (69%)
--
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