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

kapouer pushed a commit to branch master
in repository mapnik.

commit 91193be741d50eea1768a2512de6a9aeff013dfe
Merge: 2b52861 73a6d10
Author: Jérémy Lal <kapo...@melix.org>
Date:   Wed Jul 8 22:08:46 2015 +0200

    Merge tag 'upstream/3.0.0+ds'
    
    Upstream version 3.0.0+ds
    
    # gpg: Signature made mer. 08 juil. 2015 22:08:43 CEST using RSA key ID 
DD39F374
    # gpg: Good signature from "Jérémy Lal <kapo...@melix.org>"
    # gpg:                 aka "Jérémy Lal <je...@edagames.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the 
owner.
    # Primary key fingerprint: 03C4 E7AB B880 F524 306E  4815 6611 C05E DD39 
F374

 .gitignore                                         |    1 +
 .travis.yml                                        |    4 +-
 CHANGELOG.md                                       |  103 +-
 INSTALL.md                                         |   16 +-
 Makefile                                           |    2 +-
 SConstruct                                         |    5 +-
 benchmark/bench_framework.hpp                      |   11 +-
 benchmark/build.py                                 |    3 +
 benchmark/compare_images.hpp                       |   14 +-
 benchmark/run                                      |   15 +-
 benchmark/test_marker_cache.cpp                    |   42 +
 benchmark/test_offset_converter.cpp                |  101 +
 benchmark/test_polygon_clipping.cpp                |   14 +-
 benchmark/test_proj_transform1.cpp                 |    9 +-
 benchmark/test_quad_tree.cpp                       |   54 +
 bootstrap.sh                                       |    2 +-
 demo/c++/build.py                                  |    4 +-
 demo/c++/rundemo.cpp                               |    2 +-
 demo/viewer/about_dialog.cpp                       |    2 +-
 demo/viewer/about_dialog.hpp                       |    2 +-
 demo/viewer/build.py                               |    6 +-
 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/build.py                                  |    4 +-
 deps/agg/include/agg_color_gray.h                  |    4 +-
 deps/agg/src/agg_image_filters.cpp                 |    2 +-
 deps/agg/src/agg_pixfmt_rgba.cpp                   |    3 +
 deps/agg/src/agg_trans_single_path.cpp             |    4 +-
 deps/agg/src/agg_vcgen_dash.cpp                    |    4 +-
 deps/clipper/build.py                              |   26 -
 deps/clipper/include/clipper.hpp                   |  411 --
 deps/clipper/src/clipper.cpp                       | 4571 --------------------
 deps/mapnik/build.py                               |    1 -
 docs/{contributing.markdown => contributing.md}    |    0
 docs/{design.markdown => design.md}                |    0
 fonts/build.py                                     |    6 +-
 include/build.py                                   |    2 +-
 include/mapnik/agg_helpers.hpp                     |    2 +-
 include/mapnik/agg_pattern_source.hpp              |    2 +-
 include/mapnik/agg_rasterizer.hpp                  |    2 +-
 include/mapnik/agg_render_marker.hpp               |   25 +-
 include/mapnik/agg_renderer.hpp                    |    2 +-
 include/mapnik/attribute.hpp                       |    2 +-
 include/mapnik/attribute_collector.hpp             |   11 +-
 include/mapnik/attribute_descriptor.hpp            |    2 +-
 include/mapnik/boolean.hpp                         |    2 +-
 include/mapnik/box2d.hpp                           |    2 +-
 include/mapnik/cairo/cairo_context.hpp             |    6 +-
 include/mapnik/cairo/cairo_image_util.hpp          |    4 +-
 include/mapnik/cairo/cairo_render_vector.hpp       |    2 +-
 include/mapnik/cairo/cairo_renderer.hpp            |    4 +-
 include/mapnik/cairo_io.hpp                        |    2 +-
 include/mapnik/color.hpp                           |    2 +-
 include/mapnik/color_factory.hpp                   |    2 +-
 include/mapnik/config.hpp                          |    2 +-
 include/mapnik/config_error.hpp                    |    2 +-
 include/mapnik/coord.hpp                           |    2 +-
 include/mapnik/css_color_grammar.hpp               |   33 +-
 include/mapnik/css_color_grammar_impl.hpp          |    2 +-
 include/mapnik/datasource.hpp                      |    2 +-
 include/mapnik/datasource_cache.hpp                |    5 +-
 include/mapnik/debug.hpp                           |    4 +-
 include/mapnik/ellipsoid.hpp                       |    2 +-
 include/mapnik/enumeration.hpp                     |    2 +-
 include/mapnik/evaluate_global_attributes.hpp      |    2 +-
 include/mapnik/expression.hpp                      |    2 +-
 include/mapnik/expression_evaluator.hpp            |    2 +-
 include/mapnik/expression_grammar.hpp              |    5 +-
 include/mapnik/expression_grammar_impl.hpp         |    2 +-
 include/mapnik/expression_node.hpp                 |   10 +-
 include/mapnik/expression_node_types.hpp           |    2 +-
 include/mapnik/expression_string.hpp               |    2 +-
 include/mapnik/factory.hpp                         |    4 +-
 include/mapnik/feature.hpp                         |    6 +-
 include/mapnik/feature_factory.hpp                 |    2 +-
 include/mapnik/feature_kv_iterator.hpp             |    2 +-
 include/mapnik/feature_layer_desc.hpp              |    2 +-
 include/mapnik/feature_style_processor.hpp         |    2 +-
 include/mapnik/feature_style_processor_context.hpp |    2 +-
 include/mapnik/feature_style_processor_impl.hpp    |    6 +-
 include/mapnik/feature_type_style.hpp              |    2 +-
 include/mapnik/featureset.hpp                      |    2 +-
 include/mapnik/filter_featureset.hpp               |    2 +-
 include/mapnik/font_engine_freetype.hpp            |    2 +-
 include/mapnik/font_set.hpp                        |    2 +-
 include/mapnik/function_call.hpp                   |    2 +-
 include/mapnik/geom_util.hpp                       |    2 +-
 include/mapnik/geometry.hpp                        |   37 +-
 include/mapnik/geometry_adapters.hpp               |    4 +
 include/mapnik/geometry_centroid.hpp               |    2 +-
 include/mapnik/geometry_correct.hpp                |    5 +-
 include/mapnik/geometry_reprojection.hpp           |    2 +-
 include/mapnik/geometry_reprojection_impl.hpp      |    6 +-
 include/mapnik/geometry_transform.hpp              |   24 +-
 include/mapnik/global.hpp                          |    2 +-
 include/mapnik/gradient.hpp                        |    2 +-
 include/mapnik/grid/grid.hpp                       |   11 +-
 include/mapnik/grid/grid_pixel.hpp                 |    2 +-
 include/mapnik/grid/grid_pixfmt.hpp                |   10 +-
 include/mapnik/grid/grid_rasterizer.hpp            |    2 +-
 include/mapnik/grid/grid_render_marker.hpp         |    2 +-
 include/mapnik/grid/grid_renderer.hpp              |    2 +-
 include/mapnik/grid/grid_renderer_base.hpp         |    9 +-
 include/mapnik/grid/grid_rendering_buffer.hpp      |    2 +-
 include/mapnik/grid/grid_util.hpp                  |    2 +-
 include/mapnik/grid/grid_view.hpp                  |    2 +-
 include/mapnik/group/group_layout.hpp              |    2 +-
 include/mapnik/group/group_layout_manager.hpp      |    2 +-
 include/mapnik/group/group_rule.hpp                |    2 +-
 include/mapnik/group/group_symbolizer_helper.hpp   |    2 +-
 .../mapnik/group/group_symbolizer_properties.hpp   |    2 +-
 include/mapnik/hextree.hpp                         |    2 +-
 include/mapnik/hit_test_filter.hpp                 |    2 +-
 include/mapnik/image.hpp                           |    2 +-
 include/mapnik/image_any.hpp                       |    2 +-
 include/mapnik/image_compositing.hpp               |    2 +-
 include/mapnik/image_copy.hpp                      |    2 +-
 include/mapnik/image_filter.hpp                    |   83 +-
 include/mapnik/image_filter_grammar.hpp            |    5 +-
 include/mapnik/image_filter_grammar_impl.hpp       |    5 +-
 include/mapnik/image_filter_types.hpp              |    2 +-
 include/mapnik/image_impl.hpp                      |    2 +-
 include/mapnik/image_null.hpp                      |   36 +-
 include/mapnik/image_reader.hpp                    |    2 +-
 include/mapnik/image_scaling.hpp                   |    2 +-
 include/mapnik/image_scaling_traits.hpp            |    2 +-
 include/mapnik/image_util.hpp                      |   11 +-
 include/mapnik/image_util_jpeg.hpp                 |    2 +-
 include/mapnik/image_util_png.hpp                  |    4 +-
 include/mapnik/image_util_tiff.hpp                 |    2 +-
 include/mapnik/image_util_webp.hpp                 |    2 +-
 include/mapnik/image_view.hpp                      |    2 +-
 include/mapnik/image_view_any.hpp                  |    2 +-
 include/mapnik/image_view_impl.hpp                 |    2 +-
 include/mapnik/image_view_null.hpp                 |   16 +-
 include/mapnik/internal/dump_xml.hpp               |   34 -
 include/mapnik/jpeg_io.hpp                         |    2 +-
 include/mapnik/json/error_handler.hpp              |    5 +-
 .../mapnik/json/extract_bounding_box_grammar.hpp   |    3 +
 include/mapnik/json/feature_collection_grammar.hpp |    2 +-
 .../json/feature_collection_grammar_impl.hpp       |    2 +-
 include/mapnik/json/feature_generator.hpp          |    2 +-
 include/mapnik/json/feature_generator_grammar.hpp  |    6 +-
 .../mapnik/json/feature_generator_grammar_impl.hpp |    2 +-
 include/mapnik/json/feature_grammar.hpp            |    7 +-
 include/mapnik/json/feature_grammar_impl.hpp       |    2 +-
 include/mapnik/json/feature_parser.hpp             |    2 +-
 include/mapnik/json/generic_json.hpp               |    5 +-
 include/mapnik/json/geometry_generator_grammar.hpp |    5 +-
 include/mapnik/json/geometry_grammar.hpp           |    2 +-
 include/mapnik/json/geometry_grammar_impl.hpp      |    2 +-
 include/mapnik/json/geometry_parser.hpp            |    2 +-
 include/mapnik/json/geometry_util.hpp              |    2 +-
 include/mapnik/json/positions_grammar.hpp          |    5 +-
 include/mapnik/json/positions_grammar_impl.hpp     |    2 +-
 .../mapnik/json/properties_generator_grammar.hpp   |    9 +-
 .../json/properties_generator_grammar_impl.hpp     |    2 +-
 include/mapnik/json/symbolizer_grammar.hpp         |    2 +-
 include/mapnik/json/topojson_grammar.hpp           |    5 +-
 include/mapnik/json/topojson_grammar_impl.hpp      |    2 +-
 include/mapnik/json/topojson_utils.hpp             |   10 +-
 include/mapnik/json/topology.hpp                   |    5 +-
 include/mapnik/json/value_converters.hpp           |    2 +-
 include/mapnik/label_collision_detector.hpp        |   12 +-
 include/mapnik/layer.hpp                           |    2 +-
 include/mapnik/load_map.hpp                        |    2 +-
 include/mapnik/make_unique.hpp                     |    2 +-
 include/mapnik/map.hpp                             |    2 +-
 include/mapnik/mapped_memory_cache.hpp             |    4 +-
 include/mapnik/marker.hpp                          |   28 +-
 include/mapnik/marker_cache.hpp                    |   12 +-
 include/mapnik/marker_helpers.hpp                  |    7 +-
 include/mapnik/markers_placement.hpp               |    2 +-
 include/mapnik/markers_placements/interior.hpp     |    2 +-
 include/mapnik/markers_placements/line.hpp         |    2 +-
 include/mapnik/markers_placements/point.hpp        |    2 +-
 .../mapnik/markers_placements/vertext_first.hpp    |    2 +-
 include/mapnik/markers_placements/vertext_last.hpp |    2 +-
 include/mapnik/memory.hpp                          |   86 -
 include/mapnik/memory_datasource.hpp               |    2 +-
 include/mapnik/memory_featureset.hpp               |    2 +-
 include/mapnik/miniz_png.hpp                       |    2 +-
 include/mapnik/octree.hpp                          |    2 +-
 include/mapnik/offset_converter.hpp                |  313 +-
 include/mapnik/palette.hpp                         |   13 +-
 include/mapnik/params.hpp                          |    2 +-
 include/mapnik/params_impl.hpp                     |   11 +-
 include/mapnik/parse_path.hpp                      |    2 +-
 include/mapnik/parse_transform.hpp                 |    2 +-
 include/mapnik/path.hpp                            |    4 +-
 include/mapnik/path_expression.hpp                 |    2 +-
 include/mapnik/path_expression_grammar.hpp         |    5 +-
 include/mapnik/path_expression_grammar_impl.hpp    |    2 +-
 include/mapnik/pixel_position.hpp                  |    2 +-
 include/mapnik/pixel_types.hpp                     |    2 +-
 include/mapnik/plugin.hpp                          |    2 +-
 include/mapnik/png_io.hpp                          |    2 +-
 include/mapnik/pool.hpp                            |    4 +-
 include/mapnik/proj_strategy.hpp                   |    9 +-
 include/mapnik/proj_transform.hpp                  |    2 +-
 include/mapnik/projection.hpp                      |    2 +-
 include/mapnik/ptree_helpers.hpp                   |    2 +-
 include/mapnik/quad_tree.hpp                       |   41 +-
 include/mapnik/query.hpp                           |    2 +-
 include/mapnik/raster.hpp                          |    2 +-
 include/mapnik/raster_colorizer.hpp                |    2 +-
 include/mapnik/renderer_common.hpp                 |    2 +-
 include/mapnik/renderer_common/clipping_extent.hpp |    2 +-
 .../mapnik/renderer_common/pattern_alignment.hpp   |    2 +-
 .../process_building_symbolizer.hpp                |    2 +-
 .../renderer_common/process_group_symbolizer.hpp   |   44 +-
 .../renderer_common/process_markers_symbolizer.hpp |   10 +-
 .../renderer_common/process_point_symbolizer.hpp   |   18 +-
 .../renderer_common/process_polygon_symbolizer.hpp |    2 +-
 .../renderer_common/process_raster_symbolizer.hpp  |   66 +-
 include/mapnik/renderer_common/render_pattern.hpp  |    2 +-
 include/mapnik/request.hpp                         |    2 +-
 include/mapnik/rule.hpp                            |    2 +-
 include/mapnik/rule_cache.hpp                      |    2 +-
 include/mapnik/safe_cast.hpp                       |  154 +
 include/mapnik/save_map.hpp                        |    2 +-
 include/mapnik/scale_denominator.hpp               |    2 +-
 include/mapnik/segment.hpp                         |    2 +-
 include/mapnik/simplify_converter.hpp              |    2 +-
 include/mapnik/span_image_filter.hpp               |    2 +-
 include/mapnik/sql_utils.hpp                       |    5 +-
 include/mapnik/sse.hpp                             |    4 +-
 include/mapnik/svg/geometry_svg_generator.hpp      |    5 +-
 include/mapnik/svg/geometry_svg_generator_impl.hpp |    2 +-
 include/mapnik/svg/output/svg_generator.hpp        |    2 +-
 .../mapnik/svg/output/svg_output_attributes.hpp    |    2 +-
 include/mapnik/svg/output/svg_output_grammars.hpp  |    5 +-
 .../mapnik/svg/output/svg_output_grammars_impl.hpp |    5 +-
 include/mapnik/svg/output/svg_path_iterator.hpp    |    2 +-
 include/mapnik/svg/output/svg_renderer.hpp         |    2 +-
 include/mapnik/svg/svg_converter.hpp               |   11 +-
 include/mapnik/svg/svg_parser.hpp                  |    5 +-
 include/mapnik/svg/svg_path_adapter.hpp            |   18 +-
 include/mapnik/svg/svg_path_attributes.hpp         |    2 +-
 include/mapnik/svg/svg_path_commands.hpp           |    5 +-
 include/mapnik/svg/svg_path_grammar.hpp            |    2 +-
 include/mapnik/svg/svg_path_parser.hpp             |    2 +-
 include/mapnik/svg/svg_points_grammar.hpp          |    2 +-
 include/mapnik/svg/svg_renderer_agg.hpp            |   10 +-
 include/mapnik/svg/svg_storage.hpp                 |    2 +-
 include/mapnik/svg/svg_transform_grammar.hpp       |    5 +-
 include/mapnik/symbolizer.hpp                      |    2 +-
 include/mapnik/symbolizer_base.hpp                 |    2 +-
 include/mapnik/symbolizer_default_values.hpp       |    2 +-
 include/mapnik/symbolizer_dispatch.hpp             |    6 +-
 include/mapnik/symbolizer_enumerations.hpp         |    2 +-
 include/mapnik/symbolizer_hash.hpp                 |    2 +-
 include/mapnik/symbolizer_keys.hpp                 |    2 +-
 include/mapnik/symbolizer_utils.hpp                |    6 +-
 .../text/evaluated_format_properties_ptr.hpp       |    2 +-
 include/mapnik/text/face.hpp                       |    4 +-
 include/mapnik/text/font_feature_settings.hpp      |    2 +-
 include/mapnik/text/font_library.hpp               |    2 +-
 include/mapnik/text/formatting/base.hpp            |    2 +-
 include/mapnik/text/formatting/format.hpp          |    2 +-
 include/mapnik/text/formatting/layout.hpp          |    2 +-
 include/mapnik/text/formatting/list.hpp            |    2 +-
 include/mapnik/text/formatting/registry.hpp        |    4 +-
 include/mapnik/text/formatting/text.hpp            |    2 +-
 include/mapnik/text/glyph_info.hpp                 |    2 +-
 include/mapnik/text/glyph_positions.hpp            |    5 +-
 include/mapnik/text/harfbuzz_shaper.hpp            |   18 +-
 include/mapnik/text/icu_shaper.hpp                 |    2 +-
 include/mapnik/text/itemizer.hpp                   |    6 +-
 include/mapnik/text/placement_finder.hpp           |    8 +-
 include/mapnik/text/placement_finder_impl.hpp      |    2 +-
 include/mapnik/text/placements/base.hpp            |    2 +-
 include/mapnik/text/placements/dummy.hpp           |    2 +-
 include/mapnik/text/placements/list.hpp            |    4 +-
 include/mapnik/text/placements/registry.hpp        |    4 +-
 include/mapnik/text/placements/simple.hpp          |    2 +-
 include/mapnik/text/properties_util.hpp            |    2 +-
 include/mapnik/text/renderer.hpp                   |    2 +-
 include/mapnik/text/scrptrun.hpp                   |   10 +-
 include/mapnik/text/symbolizer_helpers.hpp         |    4 +-
 include/mapnik/text/text_layout.hpp                |    2 +-
 include/mapnik/text/text_line.hpp                  |    2 +-
 include/mapnik/text/text_properties.hpp            |    2 +-
 include/mapnik/tiff_io.hpp                         |    2 +-
 include/mapnik/timer.hpp                           |    2 +-
 include/mapnik/tolerance_iterator.hpp              |    2 +-
 include/mapnik/transform_expression.hpp            |    5 +-
 include/mapnik/transform_expression_grammar.hpp    |    2 +-
 .../mapnik/transform_expression_grammar_impl.hpp   |    2 +-
 include/mapnik/transform_path_adapter.hpp          |    2 +-
 include/mapnik/transform_processor.hpp             |    2 +-
 include/mapnik/unicode.hpp                         |    2 +-
 include/mapnik/util/const_rendering_buffer.hpp     |   58 +
 include/mapnik/util/container_adapter.hpp          |    5 +-
 include/mapnik/util/conversions.hpp                |    2 +-
 include/mapnik/util/dasharray_parser.hpp           |    2 +-
 include/mapnik/util/feature_to_geojson.hpp         |    2 +-
 include/mapnik/util/featureset_buffer.hpp          |    2 +-
 include/mapnik/util/file_io.hpp                    |    5 +-
 include/mapnik/util/fs.hpp                         |    2 +-
 include/mapnik/util/geometry_to_ds_type.hpp        |    2 +-
 include/mapnik/util/geometry_to_geojson.hpp        |    2 +-
 include/mapnik/util/geometry_to_svg.hpp            |    2 +-
 include/mapnik/util/geometry_to_wkb.hpp            |   12 +-
 include/mapnik/util/geometry_to_wkt.hpp            |    6 +-
 include/mapnik/util/hsl.hpp                        |    4 +-
 include/mapnik/util/noncopyable.hpp                |    2 +-
 include/mapnik/util/path_iterator.hpp              |    4 +-
 include/mapnik/util/recursive_wrapper.hpp          |    2 +-
 include/mapnik/{utils.hpp => util/singleton.hpp}   |  108 +-
 include/mapnik/util/timer.hpp                      |    2 +-
 include/mapnik/util/trim.hpp                       |    2 +-
 .../mapnik/{save_map.hpp => util/utf_conv_win.hpp} |   19 +-
 include/mapnik/util/variant_io.hpp                 |    2 +-
 include/mapnik/value.hpp                           |   21 +-
 include/mapnik/value_error.hpp                     |    2 +-
 include/mapnik/value_hash.hpp                      |    4 +-
 include/mapnik/value_types.hpp                     |    2 +-
 include/mapnik/version.hpp                         |    4 +-
 include/mapnik/vertex.hpp                          |    2 +-
 include/mapnik/vertex_cache.hpp                    |    4 +-
 include/mapnik/vertex_converters.hpp               |   34 +-
 include/mapnik/vertex_vector.hpp                   |    2 +-
 include/mapnik/view_strategy.hpp                   |   10 +-
 include/mapnik/view_transform.hpp                  |    2 +-
 include/mapnik/warp.hpp                            |    2 +-
 include/mapnik/webp_io.hpp                         |    2 +-
 include/mapnik/well_known_srs.hpp                  |    4 +-
 include/mapnik/wkb.hpp                             |    2 +-
 include/mapnik/wkt/wkt_factory.hpp                 |    2 +-
 include/mapnik/wkt/wkt_generator_grammar.hpp       |   85 +-
 include/mapnik/wkt/wkt_generator_grammar_impl.hpp  |   89 +-
 include/mapnik/wkt/wkt_grammar.hpp                 |    3 +
 include/mapnik/xml_attribute_cast.hpp              |   15 +-
 include/mapnik/xml_loader.hpp                      |   11 +-
 include/mapnik/xml_node.hpp                        |   17 +-
 include/mapnik/xml_tree.hpp                        |    6 +-
 mason_latest.sh                                    |    6 +-
 plugins/input/csv/build.py                         |    2 +-
 plugins/input/csv/csv_datasource.cpp               |   28 +-
 plugins/input/csv/csv_datasource.hpp               |    2 +-
 plugins/input/csv/csv_utils.hpp                    |    3 +-
 plugins/input/gdal/build.py                        |    4 +-
 plugins/input/gdal/gdal_datasource.cpp             |    2 +-
 plugins/input/gdal/gdal_datasource.hpp             |    2 +-
 plugins/input/gdal/gdal_featureset.cpp             |    2 +-
 plugins/input/gdal/gdal_featureset.hpp             |    2 +-
 plugins/input/geojson/build.py                     |    2 +-
 plugins/input/geojson/geojson_datasource.cpp       |   24 +-
 plugins/input/geojson/geojson_datasource.hpp       |    5 +-
 plugins/input/geojson/geojson_featureset.cpp       |    2 +-
 plugins/input/geojson/geojson_featureset.hpp       |    2 +-
 plugins/input/geojson/large_geojson_featureset.cpp |    4 +-
 plugins/input/geojson/large_geojson_featureset.hpp |    2 +-
 plugins/input/occi/build.py                        |    2 +-
 plugins/input/occi/occi_datasource.cpp             |    2 +-
 plugins/input/occi/occi_datasource.hpp             |    2 +-
 plugins/input/occi/occi_featureset.cpp             |    2 +-
 plugins/input/occi/occi_featureset.hpp             |    2 +-
 plugins/input/occi/occi_types.cpp                  |    2 +-
 plugins/input/occi/occi_types.hpp                  |    4 +-
 plugins/input/ogr/build.py                         |    2 +-
 plugins/input/ogr/ogr_converter.cpp                |   10 +-
 plugins/input/ogr/ogr_converter.hpp                |    2 +-
 plugins/input/ogr/ogr_datasource.cpp               |    5 +-
 plugins/input/ogr/ogr_datasource.hpp               |    5 +-
 plugins/input/ogr/ogr_featureset.cpp               |    8 +-
 plugins/input/ogr/ogr_featureset.hpp               |    8 +-
 plugins/input/ogr/ogr_index.hpp                    |    2 +-
 plugins/input/ogr/ogr_index_featureset.cpp         |    6 +-
 plugins/input/ogr/ogr_index_featureset.hpp         |    2 +-
 plugins/input/ogr/ogr_layer_ptr.hpp                |    2 +-
 plugins/input/osm/basiccurl.cpp                    |    2 +-
 plugins/input/osm/build.py                         |    2 +-
 plugins/input/osm/dataset_deliverer.cpp            |    2 +-
 plugins/input/osm/osm.cpp                          |    2 +-
 plugins/input/osm/osm_datasource.cpp               |    2 +-
 plugins/input/osm/osm_datasource.hpp               |    2 +-
 plugins/input/osm/osm_featureset.cpp               |    2 +-
 plugins/input/osm/osm_featureset.hpp               |    2 +-
 plugins/input/pgraster/build.py                    |    2 +-
 plugins/input/pgraster/pgraster_datasource.cpp     |    2 +-
 plugins/input/pgraster/pgraster_datasource.hpp     |    2 +-
 plugins/input/pgraster/pgraster_featureset.cpp     |    2 +-
 plugins/input/pgraster/pgraster_featureset.hpp     |    2 +-
 plugins/input/pgraster/pgraster_wkb_reader.cpp     |   22 +-
 plugins/input/pgraster/pgraster_wkb_reader.hpp     |    2 +-
 plugins/input/postgis/asyncresultset.hpp           |    2 +-
 plugins/input/postgis/build.py                     |    2 +-
 plugins/input/postgis/connection.hpp               |    2 +-
 plugins/input/postgis/connection_manager.hpp       |    4 +-
 plugins/input/postgis/cursorresultset.hpp          |    2 +-
 plugins/input/postgis/numeric2string.hpp           |    2 +-
 plugins/input/postgis/postgis_datasource.cpp       |    2 +-
 plugins/input/postgis/postgis_datasource.hpp       |    2 +-
 plugins/input/postgis/postgis_featureset.cpp       |    2 +-
 plugins/input/postgis/postgis_featureset.hpp       |    2 +-
 plugins/input/postgis/resultset.hpp                |    2 +-
 plugins/input/raster/build.py                      |    2 +-
 plugins/input/raster/raster_datasource.cpp         |    2 +-
 plugins/input/raster/raster_datasource.hpp         |    2 +-
 plugins/input/raster/raster_featureset.cpp         |    2 +-
 plugins/input/raster/raster_featureset.hpp         |    2 +-
 plugins/input/raster/raster_info.cpp               |    2 +-
 plugins/input/raster/raster_info.hpp               |    2 +-
 plugins/input/rasterlite/build.py                  |    2 +-
 plugins/input/rasterlite/rasterlite_datasource.cpp |    2 +-
 plugins/input/rasterlite/rasterlite_datasource.hpp |    2 +-
 plugins/input/rasterlite/rasterlite_featureset.cpp |    2 +-
 plugins/input/rasterlite/rasterlite_featureset.hpp |    2 +-
 plugins/input/rasterlite/rasterlite_include.hpp    |    2 +-
 plugins/input/shape/build.py                       |    2 +-
 plugins/input/shape/dbf_test.cpp                   |    2 +-
 plugins/input/shape/dbfile.cpp                     |   13 +-
 plugins/input/shape/dbfile.hpp                     |   10 +-
 plugins/input/shape/shape_datasource.cpp           |    4 +-
 plugins/input/shape/shape_datasource.hpp           |    2 +-
 plugins/input/shape/shape_featureset.cpp           |    2 +-
 plugins/input/shape/shape_featureset.hpp           |    2 +-
 plugins/input/shape/shape_index_featureset.cpp     |    2 +-
 plugins/input/shape/shape_index_featureset.hpp     |    2 +-
 plugins/input/shape/shape_io.cpp                   |   29 +-
 plugins/input/shape/shape_io.hpp                   |    2 +-
 plugins/input/shape/shape_utils.cpp                |    2 +-
 plugins/input/shape/shape_utils.hpp                |    2 +-
 plugins/input/shape/shapefile.hpp                  |   16 +-
 plugins/input/shape/shp_index.hpp                  |    2 +-
 plugins/input/sqlite/build.py                      |    2 +-
 plugins/input/sqlite/sqlite_connection.hpp         |    2 +-
 plugins/input/sqlite/sqlite_datasource.cpp         |    2 +-
 plugins/input/sqlite/sqlite_datasource.hpp         |    2 +-
 plugins/input/sqlite/sqlite_featureset.cpp         |    2 +-
 plugins/input/sqlite/sqlite_featureset.hpp         |    2 +-
 plugins/input/sqlite/sqlite_prepared.hpp           |    2 +-
 plugins/input/sqlite/sqlite_resultset.hpp          |    2 +-
 plugins/input/sqlite/sqlite_utils.hpp              |    3 +-
 plugins/input/topojson/build.py                    |    2 +-
 plugins/input/topojson/topojson_datasource.cpp     |    2 +-
 plugins/input/topojson/topojson_datasource.hpp     |    5 +-
 plugins/input/topojson/topojson_featureset.cpp     |   18 +-
 plugins/input/topojson/topojson_featureset.hpp     |    2 +-
 src/agg/agg_renderer.cpp                           |   14 +-
 src/agg/process_building_symbolizer.cpp            |    2 +-
 src/agg/process_debug_symbolizer.cpp               |   16 +-
 src/agg/process_dot_symbolizer.cpp                 |    8 +-
 src/agg/process_group_symbolizer.cpp               |    4 +-
 src/agg/process_line_pattern_symbolizer.cpp        |   19 +-
 src/agg/process_line_symbolizer.cpp                |   26 +-
 src/agg/process_markers_symbolizer.cpp             |    2 +-
 src/agg/process_point_symbolizer.cpp               |    2 +-
 src/agg/process_polygon_pattern_symbolizer.cpp     |    2 +-
 src/agg/process_polygon_symbolizer.cpp             |    2 +-
 src/agg/process_raster_symbolizer.cpp              |    4 +-
 src/agg/process_shield_symbolizer.cpp              |    4 +-
 src/agg/process_text_symbolizer.cpp                |   18 +-
 src/box2d.cpp                                      |   13 +-
 src/build.py                                       |    9 +-
 src/cairo/cairo_context.cpp                        |   26 +-
 src/cairo/cairo_render_vector.cpp                  |    2 +-
 src/cairo/cairo_renderer.cpp                       |   18 +-
 src/cairo/process_building_symbolizer.cpp          |    2 +-
 src/cairo/process_debug_symbolizer.cpp             |    8 +-
 src/cairo/process_group_symbolizer.cpp             |    4 +-
 src/cairo/process_line_pattern_symbolizer.cpp      |   14 +-
 src/cairo/process_line_symbolizer.cpp              |   13 +-
 src/cairo/process_markers_symbolizer.cpp           |    4 +-
 src/cairo/process_point_symbolizer.cpp             |    2 +-
 src/cairo/process_polygon_pattern_symbolizer.cpp   |    2 +-
 src/cairo/process_polygon_symbolizer.cpp           |    2 +-
 src/cairo/process_raster_symbolizer.cpp            |    4 +-
 src/cairo/process_text_symbolizer.cpp              |    6 +-
 src/cairo_io.cpp                                   |    2 +-
 src/color.cpp                                      |    5 +-
 src/color_factory.cpp                              |    2 +-
 src/conversions.cpp                                |    5 +-
 src/css_color_grammar.cpp                          |    2 +-
 src/dasharray_parser.cpp                           |    4 +-
 src/datasource_cache.cpp                           |    3 +-
 src/datasource_cache_static.cpp                    |    6 +-
 src/debug.cpp                                      |    2 +-
 src/expression.cpp                                 |    2 +-
 src/expression_grammar.cpp                         |    2 +-
 src/expression_node.cpp                            |   10 +-
 src/expression_string.cpp                          |    2 +-
 src/feature_kv_iterator.cpp                        |    2 +-
 src/feature_style_processor.cpp                    |    2 +-
 src/feature_type_style.cpp                         |    2 +-
 src/font_engine_freetype.cpp                       |   10 +-
 src/font_set.cpp                                   |    2 +-
 src/fs.cpp                                         |    4 +-
 src/function_call.cpp                              |    2 +-
 src/geometry_reprojection.cpp                      |    2 +-
 src/gradient.cpp                                   |    2 +-
 src/grid/grid.cpp                                  |    2 +-
 src/grid/grid_renderer.cpp                         |   22 +-
 src/grid/process_building_symbolizer.cpp           |    2 +-
 src/grid/process_group_symbolizer.cpp              |    6 +-
 src/grid/process_line_pattern_symbolizer.cpp       |    9 +-
 src/grid/process_line_symbolizer.cpp               |   20 +-
 src/grid/process_markers_symbolizer.cpp            |    2 +-
 src/grid/process_point_symbolizer.cpp              |    2 +-
 src/grid/process_polygon_pattern_symbolizer.cpp    |    2 +-
 src/grid/process_polygon_symbolizer.cpp            |    2 +-
 src/grid/process_raster_symbolizer.cpp             |    2 +-
 src/grid/process_shield_symbolizer.cpp             |    4 +-
 src/grid/process_text_symbolizer.cpp               |   19 +-
 src/group/group_layout_manager.cpp                 |    9 +-
 src/group/group_rule.cpp                           |    2 +-
 src/group/group_symbolizer_helper.cpp              |    2 +-
 src/image.cpp                                      |    2 +-
 src/image_any.cpp                                  |   26 +-
 src/image_compositing.cpp                          |   47 +-
 src/image_copy.cpp                                 |   88 +-
 src/image_filter_types.cpp                         |    5 +-
 src/image_options.cpp                              |    8 +
 src/image_reader.cpp                               |    2 +-
 src/image_scaling.cpp                              |    4 +-
 src/image_util.cpp                                 |  215 +-
 src/image_util_jpeg.cpp                            |    2 +-
 src/image_util_png.cpp                             |    4 +-
 src/image_util_tiff.cpp                            |    2 +-
 src/image_util_webp.cpp                            |    2 +-
 src/image_view.cpp                                 |    2 +-
 src/image_view_any.cpp                             |    6 +-
 src/jpeg_reader.cpp                                |    7 +-
 src/json/build.py                                  |    2 +-
 .../mapnik_json_feature_collection_grammar.cpp     |    2 +-
 src/json/mapnik_json_feature_grammar.cpp           |    2 +-
 src/json/mapnik_json_generator_grammar.cpp         |    2 +-
 src/json/mapnik_json_geometry_grammar.cpp          |    2 +-
 src/json/mapnik_topojson_grammar.cpp               |    2 +-
 src/layer.cpp                                      |    2 +-
 src/libxml2_loader.cpp                             |    2 +-
 src/load_map.cpp                                   |   37 +-
 src/map.cpp                                        |    4 +-
 src/mapped_memory_cache.cpp                        |    6 +-
 src/marker_cache.cpp                               |   29 +-
 src/marker_helpers.cpp                             |    3 +-
 src/memory.cpp                                     |   62 -
 src/memory_datasource.cpp                          |    2 +-
 src/miniz_png.cpp                                  |    7 +-
 src/palette.cpp                                    |    2 +-
 src/params.cpp                                     |    2 +-
 src/parse_path.cpp                                 |    2 +-
 src/parse_transform.cpp                            |    2 +-
 src/plugin.cpp                                     |    2 +-
 src/png_reader.cpp                                 |    2 +-
 src/proj_transform.cpp                             |   78 +-
 src/projection.cpp                                 |    3 +-
 src/rapidxml_loader.cpp                            |   10 +-
 src/raster_colorizer.cpp                           |    2 +-
 src/renderer_common.cpp                            |    3 +-
 src/renderer_common/process_group_symbolizer.cpp   |   30 +-
 src/renderer_common/render_pattern.cpp             |    2 +-
 src/request.cpp                                    |    2 +-
 src/rule.cpp                                       |    2 +-
 src/save_map.cpp                                   |   64 +-
 src/scale_denominator.cpp                          |    2 +-
 src/simplify.cpp                                   |    2 +
 src/svg/output/process_line_symbolizer.cpp         |    2 +-
 src/svg/output/process_polygon_symbolizer.cpp      |    4 +-
 src/svg/output/process_symbolizers.cpp             |    8 +-
 src/svg/output/svg_generator.cpp                   |    9 +-
 src/svg/output/svg_output_attributes.cpp           |    2 +-
 src/svg/output/svg_output_grammars.cpp             |    2 +-
 src/svg/output/svg_renderer.cpp                    |    2 +-
 src/svg/svg_parser.cpp                             |    6 +-
 src/svg/svg_path_parser.cpp                        |    2 +-
 src/svg/svg_points_parser.cpp                      |    2 +-
 src/svg/svg_transform_parser.cpp                   |    2 +-
 src/symbolizer.cpp                                 |    2 +-
 src/symbolizer_enumerations.cpp                    |    2 +-
 src/symbolizer_keys.cpp                            |    2 +-
 src/text/face.cpp                                  |    2 +-
 src/text/font_feature_settings.cpp                 |    3 +-
 src/text/font_library.cpp                          |   15 +-
 src/text/formatting/base.cpp                       |    2 +-
 src/text/formatting/format.cpp                     |    2 +-
 src/text/formatting/layout.cpp                     |    2 +-
 src/text/formatting/list.cpp                       |    2 +-
 src/text/formatting/registry.cpp                   |    2 +-
 src/text/formatting/text.cpp                       |    4 +-
 src/text/glyph_positions.cpp                       |    2 +-
 src/text/itemizer.cpp                              |    2 +-
 src/text/placement_finder.cpp                      |   63 +-
 src/text/placements/base.cpp                       |    2 +-
 src/text/placements/dummy.cpp                      |    4 +-
 src/text/placements/list.cpp                       |    6 +-
 src/text/placements/registry.cpp                   |    2 +-
 src/text/placements/simple.cpp                     |    6 +-
 src/text/properties_util.cpp                       |    2 +-
 src/text/renderer.cpp                              |   11 +-
 src/text/symbolizer_helpers.cpp                    |   81 +-
 src/text/text_layout.cpp                           |    6 +-
 src/text/text_line.cpp                             |    4 +-
 src/text/text_properties.cpp                       |    2 +-
 src/tiff_reader.cpp                                |   96 +-
 src/transform_expression.cpp                       |    2 +-
 src/transform_expression_grammar.cpp               |    2 +-
 src/unicode.cpp                                    |    2 +-
 src/{utils.cpp => util/utf_conv_win.cpp}           |    4 +-
 src/vertex_cache.cpp                               |   10 +-
 src/warp.cpp                                       |    2 +-
 src/webp_reader.cpp                                |    2 +-
 src/well_known_srs.cpp                             |    2 +-
 src/wkb.cpp                                        |   48 +-
 src/wkt/build.py                                   |    4 +-
 src/wkt/mapnik_wkt_generator_grammar.cpp           |    6 +-
 src/xml_tree.cpp                                   |    6 +-
 test/{unit/run.cpp => cleanup.hpp}                 |   33 +-
 test/standalone/csv_test.cpp                       | 1032 +++--
 test/unit/color/css_color.cpp                      |   38 +
 test/unit/core/conversions_test.cpp                |   17 +-
 test/unit/core/copy_move_test.cpp                  |  103 +-
 test/unit/core/exceptions_test.cpp                 |    2 +-
 test/unit/geometry/geometry_envelope_test.cpp      |    2 +-
 test/unit/geometry/geometry_reprojection.cpp       |   10 +-
 test/unit/geometry/geometry_strategy_test.cpp      |   30 +-
 test/unit/imaging/image.cpp                        |    1 +
 test/unit/imaging/image_io_test.cpp                |   15 +
 test/unit/imaging/image_painted_test.cpp           |   71 +-
 test/unit/imaging/image_set_pixel.cpp              |   28 +
 test/unit/imaging/tiff_io.cpp                      |    5 +-
 test/unit/numerics/safe_cast.cpp                   |   59 +
 test/unit/projection/proj_transform.cpp            |   88 +-
 test/unit/run.cpp                                  |   27 +-
 test/unit/serialization/xml_parser_trim.cpp        |   45 +
 test/unit/vertex_adapter/line_offset_test.cpp      |   12 +-
 test/unit/vertex_adapter/offset_converter.cpp      |  398 ++
 test/visual/compare_images.hpp                     |   53 -
 test/visual/config.hpp                             |   13 +-
 test/visual/map_sizes_grammar.hpp                  |    2 +
 test/visual/renderer.hpp                           |  117 +-
 test/visual/report.cpp                             |   13 +-
 test/visual/report.hpp                             |    9 +-
 test/visual/run.cpp                                |   62 +-
 test/visual/runner.cpp                             |  143 +-
 test/visual/runner.hpp                             |    7 +-
 utils/geometry_to_wkb/main.cpp                     |    2 +-
 utils/mapnik-config/build.py                       |    6 +-
 utils/ogrindex/build.py                            |    6 +-
 utils/ogrindex/ogrindex.cpp                        |    2 +-
 utils/pgsql2sqlite/build.py                        |    4 +-
 utils/pgsql2sqlite/main.cpp                        |    2 +-
 utils/pgsql2sqlite/pgsql2sqlite.hpp                |    2 +-
 utils/pgsql2sqlite/sqlite.cpp                      |    2 +-
 utils/pgsql2sqlite/sqlite.hpp                      |    2 +-
 utils/shapeindex/build.py                          |    8 +-
 utils/shapeindex/quadtree.hpp                      |    2 +-
 utils/shapeindex/shapeindex.cpp                    |    2 +-
 utils/svg2png/build.py                             |    4 +-
 utils/svg2png/svg2png.cpp                          |    2 +-
 667 files changed, 4429 insertions(+), 8041 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

Reply via email to