[mapnik] branch upstream updated (d34dadb -> 4cbbc30)
Bas Couwenberg
sebastic at debian.org
Fri Aug 5 13:39:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository mapnik.
from d34dadb Imported Upstream version 3.0.11+ds
new 4cbbc30 Imported Upstream version 3.0.12~rc1+ds
The 1 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 | 35 +-
CHANGELOG.md | 68 ++-
INSTALL.md | 2 +-
README.md | 5 +-
SConstruct | 31 +-
appveyor.yml | 2 +-
bootstrap.sh | 12 +-
circle.yml | 14 +-
demo/c++/README.md | 4 +-
demo/c++/rundemo.cpp | 6 +-
demo/data/boundaries.dbf | Bin 750 -> 749 bytes
demo/data/boundaries.prj | 1 -
demo/data/boundaries.sbx | Bin 116 -> 0 bytes
demo/data/boundaries_l.dbf | Bin 972 -> 971 bytes
demo/data/boundaries_l.prj | 1 -
demo/data/boundaries_l.sbx | Bin 132 -> 0 bytes
demo/data/ontdrainage.dbf | Bin 264968 -> 264967 bytes
demo/data/ontdrainage.prj | 1 -
demo/data/ontdrainage.sbx | Bin 644 -> 0 bytes
demo/data/popplaces.dbf | Bin 93538 -> 93537 bytes
demo/data/popplaces.prj | 1 -
demo/data/popplaces.sbx | Bin 268 -> 0 bytes
demo/data/qcdrainage.dbf | Bin 219468 -> 219467 bytes
demo/data/qcdrainage.prj | 1 -
demo/data/qcdrainage.sbx | Bin 644 -> 0 bytes
demo/data/roads.dbf | Bin 1127356 -> 1127355 bytes
demo/data/roads.prj | 1 -
demo/data/roads.sbx | Bin 2060 -> 0 bytes
deps/agg/include/agg_rasterizer_scanline_aa.h | 161 ++++---
deps/mapnik/build.py | 2 +-
include/mapnik/box2d.hpp | 5 +-
src/box2d.cpp => include/mapnik/box2d_impl.hpp | 7 +-
include/mapnik/config.hpp | 13 +-
include/mapnik/debug.hpp | 6 +-
include/mapnik/expression_grammar_impl.hpp | 1 +
include/mapnik/feature.hpp | 2 +-
include/mapnik/featureset.hpp | 15 +
include/mapnik/function_call.hpp | 11 +
include/mapnik/geometry.hpp | 70 +--
include/mapnik/geometry_envelope.hpp | 4 +-
include/mapnik/geometry_envelope_impl.hpp | 23 +-
include/mapnik/json/attribute_value_visitor.hpp | 68 +++
.../json/extract_bounding_box_grammar_impl.hpp | 9 +-
include/mapnik/json/feature_grammar.hpp | 32 +-
include/mapnik/json/feature_grammar_impl.hpp | 26 +-
include/mapnik/json/generic_json.hpp | 67 ++-
include/mapnik/json/geometry_grammar_impl.hpp | 15 +-
include/mapnik/json/positions_grammar.hpp | 23 -
include/mapnik/json/positions_grammar_impl.hpp | 24 ++
include/mapnik/json/stringifier.hpp | 101 +++++
include/mapnik/json/topojson_grammar.hpp | 152 ++++++-
include/mapnik/json/topojson_grammar_impl.hpp | 184 +++-----
include/mapnik/json/topojson_utils.hpp | 195 +++++----
include/mapnik/json/topology.hpp | 9 +-
include/mapnik/palette.hpp | 21 +-
include/mapnik/params.hpp | 4 +
include/mapnik/plugin.hpp | 3 +-
include/mapnik/png_io.hpp | 75 ++--
.../renderer_common/process_point_symbolizer.hpp | 2 +-
include/mapnik/symbolizer_base.hpp | 4 +-
include/mapnik/text/placement_finder.hpp | 1 -
include/mapnik/text/scrptrun.hpp | 2 +-
include/mapnik/text/symbolizer_helpers.hpp | 6 +-
include/mapnik/util/char_array_buffer.hpp | 87 ++++
include/mapnik/util/is_clockwise.hpp | 11 +-
include/mapnik/util/variant.hpp | 10 +-
include/mapnik/value_hash.hpp | 16 +-
include/mapnik/version.hpp | 2 +-
include/mapnik/vertex_adapters.hpp | 16 +-
include/mapnik/warning_ignore.hpp | 1 +
include/mapnik/wkt/wkt_generator_grammar.hpp | 2 +-
include/mapnik/xml_attribute_cast.hpp | 15 +-
localize.sh | 10 +-
mason_latest.sh | 8 +-
plugins/input/csv/csv_datasource.cpp | 2 +-
plugins/input/gdal/gdal_datasource.cpp | 11 +-
plugins/input/gdal/gdal_featureset.cpp | 100 +++--
plugins/input/gdal/gdal_featureset.hpp | 5 -
plugins/input/geojson/geojson_datasource.cpp | 4 +-
plugins/input/ogr/ogr_datasource.cpp | 20 +-
plugins/input/pgraster/pgraster_datasource.cpp | 19 +-
plugins/input/pgraster/pgraster_wkb_reader.cpp | 2 +-
plugins/input/postgis/postgis_datasource.cpp | 8 +-
plugins/input/raster/raster_datasource.cpp | 2 +-
plugins/input/sqlite/sqlite_datasource.cpp | 4 +-
plugins/input/topojson/topojson_datasource.cpp | 25 +-
scripts/travis-common.sh | 5 +-
src/agg/process_line_pattern_symbolizer.cpp | 2 +-
src/agg/process_polygon_pattern_symbolizer.cpp | 2 +-
src/agg/process_text_symbolizer.cpp | 2 +-
src/box2d.cpp | 475 +-------------------
src/cairo/process_line_pattern_symbolizer.cpp | 2 +-
src/cairo/process_polygon_pattern_symbolizer.cpp | 2 +-
src/datasource_cache.cpp | 4 +-
src/font_engine_freetype.cpp | 4 +-
src/geometry_envelope.cpp | 21 +-
src/grid/process_text_symbolizer.cpp | 2 +-
src/image_compositing.cpp | 34 +-
src/jpeg_reader.cpp | 30 +-
src/load_map.cpp | 18 +-
src/map.cpp | 2 +-
src/marker_helpers.cpp | 9 +
src/palette.cpp | 10 -
src/plugin.cpp | 14 +-
src/png_reader.cpp | 32 +-
src/proj_transform.cpp | 91 ++--
src/renderer_common/render_markers_symbolizer.cpp | 4 +-
src/text/formatting/layout.cpp | 6 +-
src/text/placement_finder.cpp | 68 +--
src/text/symbolizer_helpers.cpp | 38 +-
src/text/text_line.cpp | 2 +-
src/text/text_properties.cpp | 12 +-
src/tiff_reader.cpp | 33 +-
src/value.cpp | 4 +-
src/vertex_adapters.cpp | 8 +-
src/webp_reader.cpp | 3 -
src/xml_tree.cpp | 6 +-
test/run | 14 +-
test/standalone/font_registration_test.cpp | 18 +-
test/unit/core/expressions_test.cpp | 3 +
test/unit/datasource/ds_test_util.hpp | 15 +-
test/unit/datasource/geojson.cpp | 68 +++
test/unit/datasource/postgis.cpp | 477 +++++++++++----------
test/unit/datasource/topojson.cpp | 41 +-
test/unit/geometry/geometry_envelope_test.cpp | 86 ++--
test/unit/geometry/geometry_equal.hpp | 11 +-
test/unit/geometry/geometry_test_helper.cpp | 15 +
test/unit/geometry/is_clockwise.cpp | 27 ++
test/unit/imaging/image_io_test.cpp | 51 ++-
test/unit/imaging/tiff_io.cpp | 19 +-
test/unit/serialization/wkb_test.cpp | 4 +
test/visual/renderer.hpp | 135 ++++--
test/visual/run.cpp | 39 +-
utils/mapnik-index/mapnik-index.cpp | 13 +-
utils/mapnik-index/process_csv_file.cpp | 9 +-
utils/mapnik-render/mapnik-render.cpp | 4 +-
utils/pgsql2sqlite/pgsql2sqlite.hpp | 10 +-
137 files changed, 2137 insertions(+), 1775 deletions(-)
delete mode 100644 demo/data/boundaries.prj
delete mode 100644 demo/data/boundaries.sbx
delete mode 100644 demo/data/boundaries_l.prj
delete mode 100644 demo/data/boundaries_l.sbx
delete mode 100644 demo/data/ontdrainage.prj
delete mode 100644 demo/data/ontdrainage.sbx
delete mode 100644 demo/data/popplaces.prj
delete mode 100644 demo/data/popplaces.sbx
delete mode 100644 demo/data/qcdrainage.prj
delete mode 100644 demo/data/qcdrainage.sbx
delete mode 100644 demo/data/roads.prj
delete mode 100644 demo/data/roads.sbx
copy src/box2d.cpp => include/mapnik/box2d_impl.hpp (98%)
create mode 100644 include/mapnik/json/attribute_value_visitor.hpp
create mode 100644 include/mapnik/json/stringifier.hpp
create mode 100644 include/mapnik/util/char_array_buffer.hpp
create mode 100644 test/unit/geometry/geometry_test_helper.cpp
create mode 100644 test/unit/geometry/is_clockwise.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