This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit 5fd827dd6c558fcb9bd1b96e04a6f5c798892abc Merge: 335a7ba fd3c511 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 10 11:48:59 2015 +0200 Merge tag 'upstream/3.0.6+ds' Upstream version 3.0.6+ds .gitattributes | 1 + .gitignore | 1 + .travis.yml | 12 +- CHANGELOG.md | 18 +- INSTALL.md | 3 - README.md | 4 +- SConstruct | 1961 ++++++++++---------- appveyor.yml | 26 + benchmark/build.py | 1 + benchmark/run | 2 +- benchmark/test_getline.cpp | 125 ++ benchmark/test_rendering.cpp | 2 +- bootstrap.sh | 22 +- demo/viewer/mapwidget.cpp | 2 +- demo/viewer/viewer.pro | 1 + include/mapnik/css_color_grammar.hpp | 1 + include/mapnik/css_color_grammar_impl.hpp | 9 +- include/mapnik/csv/csv_grammar.hpp | 58 +- include/mapnik/expression_grammar.hpp | 1 + include/mapnik/expression_grammar_impl.hpp | 8 + include/mapnik/feature.hpp | 3 - include/mapnik/feature_style_processor.hpp | 2 +- include/mapnik/feature_style_processor_impl.hpp | 31 +- include/mapnik/geometry_is_simple.hpp | 47 +- include/mapnik/geometry_is_valid.hpp | 178 +- include/mapnik/image_any.hpp | 4 +- include/mapnik/jpeg_io.hpp | 10 +- include/mapnik/json/error_handler.hpp | 2 +- .../mapnik/json/extract_bounding_box_grammar.hpp | 14 +- include/mapnik/quad_tree.hpp | 172 +- .../renderer_common/process_group_symbolizer.hpp | 4 +- include/mapnik/simplify_converter.hpp | 4 +- include/mapnik/text/placements/base.hpp | 4 +- include/mapnik/text/placements/dummy.hpp | 6 +- include/mapnik/text/placements/simple.hpp | 4 +- include/mapnik/util/singleton.hpp | 9 + include/mapnik/util/spatial_index.hpp | 155 ++ include/mapnik/value.hpp | 33 +- include/mapnik/version.hpp | 2 +- include/mapnik/webp_io.hpp | 6 +- plugins/input/csv/build.py | 7 +- plugins/input/csv/csv_datasource.cpp | 250 ++- plugins/input/csv/csv_datasource.hpp | 14 +- plugins/input/csv/csv_featureset.cpp | 5 +- plugins/input/csv/csv_featureset.hpp | 11 +- plugins/input/csv/csv_index_featureset.cpp | 130 ++ ...csv_featureset.hpp => csv_index_featureset.hpp} | 52 +- plugins/input/csv/csv_inline_featureset.cpp | 6 +- plugins/input/csv/csv_inline_featureset.hpp | 14 +- plugins/input/csv/csv_utils.hpp | 74 +- plugins/input/gdal/build.py | 2 +- plugins/input/geojson/build.py | 6 +- plugins/input/geojson/geojson_datasource.cpp | 6 +- plugins/input/ogr/build.py | 2 +- plugins/input/pgraster/build.py | 5 +- plugins/input/postgis/build.py | 4 +- plugins/input/postgis/postgis_datasource.cpp | 22 +- plugins/input/postgis/postgis_datasource.hpp | 1 + plugins/input/postgis/postgis_featureset.cpp | 14 +- plugins/input/postgis/postgis_featureset.hpp | 4 +- plugins/input/raster/build.py | 6 +- plugins/input/raster/raster_datasource.cpp | 1 + plugins/input/shape/build.py | 6 +- plugins/input/shape/shape_index_featureset.cpp | 21 +- plugins/input/shape/shape_index_featureset.hpp | 4 +- plugins/input/shape/shp_index.hpp | 103 - plugins/input/sqlite/build.py | 6 +- plugins/input/topojson/build.py | 6 +- scripts/build-appveyor.bat | 70 + scripts/build-local.bat | 32 + scripts/parse-commit-message.ps1 | 5 + src/cairo/process_debug_symbolizer.cpp | 1 - src/debug.cpp | 16 +- src/image_util.cpp | 1 - src/svg/svg_parser.cpp | 54 +- src/text/placements/simple.cpp | 1 + test/standalone/csv_test.cpp | 16 +- test/standalone/datasource_registration_test.cpp | 32 +- test/unit/color/css_color.cpp | 131 +- test/unit/core/comparison_test.cpp | 49 + test/unit/datasource/spatial_index.cpp | 90 + test/unit/geometry/geometry_is_simple.cpp | 320 ++++ test/unit/geometry/geometry_is_valid.cpp | 431 ++++- test/unit/imaging/image_filter.cpp | 46 + test/unit/serialization/wkb_formats_test.cpp | 12 +- test/unit/svg/svg_parser_test.cpp | 20 + test/visual/renderer.hpp | 17 +- test/visual/report.cpp | 54 +- test/visual/report.hpp | 2 +- test/visual/run.cpp | 66 +- test/visual/runner.cpp | 27 +- test/visual/runner.hpp | 29 +- utils/mapnik-index/build.py | 59 + utils/mapnik-index/mapnik-index.cpp | 353 ++++ utils/pgsql2sqlite/pgsql2sqlite.hpp | 2 +- utils/shapeindex/quadtree.hpp | 297 --- utils/shapeindex/shapeindex.cpp | 8 +- 97 files changed, 4083 insertions(+), 1888 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