[mapnik] 02/04: Merge tag 'upstream/3.0.9_rc3+ds'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit ce35370ccae0dbdf5dd2c5657ea398f631eb33ff
Merge: 4c889af 991733b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 24 23:54:20 2015 +0100

    Merge tag 'upstream/3.0.9_rc3+ds'
    
    Upstream version 3.0.9~rc3+ds

 CHANGELOG.md                                       |  14 +-
 deps/agg/src/agg_pixfmt_rgba.cpp                   |   8 +-
 deps/boost/gil/extension/toolbox/hsl.hpp           |   4 +-
 deps/boost/gil/extension/toolbox/hsv.hpp           |   4 +-
 include/mapnik/geometry_centroid.hpp               |  50 +++--
 include/mapnik/geometry_is_empty.hpp               |  83 ++++++++-
 include/mapnik/geometry_remove_empty.hpp           |  77 ++++++++
 include/mapnik/image_scaling.hpp                   |  17 +-
 include/mapnik/image_scaling_traits.hpp            |  25 +--
 .../json/feature_collection_grammar_impl.hpp       |  13 +-
 .../renderer_common/process_raster_symbolizer.hpp  |   8 +-
 include/mapnik/simplify_converter.hpp              |  32 ++--
 include/mapnik/span_image_filter.h                 | 178 ++++++++++++++++++
 include/mapnik/warp.hpp                            |  11 +-
 plugins/input/csv/build.py                         |   2 +-
 plugins/input/csv/csv_utils.hpp                    |  26 +--
 plugins/input/geojson/geojson_datasource.cpp       |  46 +++--
 plugins/input/postgis/connection_manager.hpp       |   2 +-
 src/box2d.cpp                                      |  14 +-
 src/grid/grid_renderer.cpp                         |   3 +-
 src/image_scaling.cpp                              |  34 ++--
 src/map.cpp                                        |   2 +-
 src/warp.cpp                                       |  47 +++--
 test/unit/datasource/geojson.cpp                   |  45 ++++-
 test/unit/datasource/shapeindex.cpp                | 120 ++++++++++++
 test/unit/geometry/centroid.cpp                    | 205 +++++++++++++++++++++
 test/unit/geometry/has_empty.cpp                   | 150 +++++++++++++++
 test/unit/geometry/is_empty.cpp                    | 117 ++++++++++++
 test/unit/geometry/label_algo_test.cpp             |  33 ----
 test/unit/geometry/remove_empty.cpp                |  53 ++++++
 utils/mapnik-index/build.py                        |   2 +-
 utils/mapnik-index/mapnik-index.cpp                |  14 +-
 utils/mapnik-index/process_geojson_file.cpp        |  41 ++++-
 utils/mapnik-index/process_geojson_file.hpp        |   2 +-
 utils/shapefile/shapefile_reader.py                |  14 +-
 utils/shapeindex/shapeindex.cpp                    |  44 +++--
 36 files changed, 1343 insertions(+), 197 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git