[libosmium] 02/04: Merge tag 'upstream/2.12.2' into experimental
Bas Couwenberg
sebastic at debian.org
Wed May 3 16:36:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository libosmium.
commit d910459df4313a8802924c3a2b010ee7020c398a
Merge: d598eb0 afcae49
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed May 3 18:19:58 2017 +0200
Merge tag 'upstream/2.12.2' into experimental
Upstream version 2.12.2
CHANGELOG.md | 37 +-
CMakeLists.txt | 14 +-
appveyor.yml | 5 +
build-appveyor.bat | 3 +-
cmake/FindOsmium.cmake | 4 +
include/osmium/area/assembler.hpp | 2 +
include/osmium/area/detail/basic_assembler.hpp | 36 +-
include/osmium/area/detail/node_ref_segment.hpp | 2 +-
include/osmium/area/detail/proto_ring.hpp | 18 +-
include/osmium/area/detail/segment_list.hpp | 21 +-
include/osmium/area/multipolygon_collector.hpp | 1 +
include/osmium/area/problem_reporter.hpp | 8 +
include/osmium/area/problem_reporter_exception.hpp | 6 +
include/osmium/area/problem_reporter_ogr.hpp | 16 +
include/osmium/area/problem_reporter_stream.hpp | 5 +
include/osmium/area/stats.hpp | 3 +
include/osmium/index/map/dense_file_array.hpp | 4 +
include/osmium/index/map/dense_mem_array.hpp | 4 +
include/osmium/index/map/dense_mmap_array.hpp | 4 +
include/osmium/index/map/sparse_file_array.hpp | 4 +
include/osmium/index/map/sparse_mem_array.hpp | 4 +
include/osmium/index/map/sparse_mem_map.hpp | 4 +
include/osmium/index/map/sparse_mem_table.hpp | 24 +-
include/osmium/index/map/sparse_mmap_array.hpp | 4 +
include/osmium/index/node_locations_map.hpp | 2 +
include/osmium/io/detail/input_format.hpp | 53 +-
include/osmium/io/detail/o5m_input_format.hpp | 14 +-
include/osmium/io/detail/opl_input_format.hpp | 19 +-
include/osmium/io/detail/pbf_input_format.hpp | 14 +-
include/osmium/io/detail/xml_input_format.hpp | 14 +-
include/osmium/io/reader.hpp | 54 +-
include/osmium/io/writer.hpp | 26 +-
include/osmium/tags/matcher.hpp | 13 +-
include/osmium/util/file.hpp | 4 +-
include/osmium/util/string_matcher.hpp | 2 +-
include/osmium/version.hpp | 4 +-
test/CMakeLists.txt | 2 +-
test/data-tests/CMakeLists.txt | 6 +-
test/data-tests/multipolygon.qgs | 2089 ++++++++++++--------
test/data-tests/testdata-xml.cpp | 10 +-
test/t/area/test_node_ref_segment.cpp | 65 +-
test/t/io/data-nonl.opl | 1 +
test/t/io/data.opl | 1 +
test/t/io/test_opl_parser.cpp | 22 +
test/t/io/test_reader.cpp | 52 +-
test/t/io/test_reader_with_mock_parser.cpp | 14 +-
test/t/io/test_writer_with_mock_encoder.cpp | 2 +-
47 files changed, 1647 insertions(+), 1069 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git
More information about the Pkg-grass-devel
mailing list