This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository libosmium.
commit 14af98bc4969e7ff78cd4d77a0b0dee2c23b4dc7 Merge: 815d987 d65850a Author: Bas Couwenberg <[email protected]> Date: Tue Mar 7 18:35:24 2017 +0100 Merge tag 'upstream/2.12.0' into experimental Upstream version 2.12.0 CHANGELOG.md | 60 +- CMakeLists.txt | 5 +- benchmarks/CMakeLists.txt | 1 + cmake/FindOsmium.cmake | 14 + examples/CMakeLists.txt | 1 + include/osmium/area/assembler.hpp | 1355 +----------- include/osmium/area/assembler_config.hpp | 152 ++ include/osmium/area/detail/basic_assembler.hpp | 1204 +++++++++++ include/osmium/area/detail/segment_list.hpp | 28 +- include/osmium/area/detail/vector.hpp | 2 +- include/osmium/area/geom_assembler.hpp | 131 ++ include/osmium/area/problem_reporter.hpp | 9 + include/osmium/area/problem_reporter_exception.hpp | 42 +- include/osmium/area/problem_reporter_ogr.hpp | 12 +- include/osmium/area/problem_reporter_stream.hpp | 5 + include/osmium/area/stats.hpp | 5 +- include/osmium/builder/builder.hpp | 18 +- include/osmium/builder/builder_helper.hpp | 6 +- include/osmium/builder/osm_object_builder.hpp | 20 +- include/osmium/geom/factory.hpp | 2 +- include/osmium/geom/mercator_projection.hpp | 6 +- include/osmium/geom/projection.hpp | 54 +- include/osmium/handler/node_locations_for_ways.hpp | 14 +- include/osmium/index/id_set.hpp | 1 + include/osmium/index/map/sparse_mem_table.hpp | 2 +- .../osmium/{version.hpp => index/nwr_array.hpp} | 31 +- include/osmium/index/relations_map.hpp | 280 ++- include/osmium/io/detail/pbf_input_format.hpp | 2 +- include/osmium/io/detail/pbf_output_format.hpp | 1 - include/osmium/io/detail/protobuf_tags.hpp | 2 +- include/osmium/io/detail/string_util.hpp | 2 +- include/osmium/io/detail/write_thread.hpp | 2 +- include/osmium/io/detail/xml_input_format.hpp | 6 +- include/osmium/io/detail/xml_output_format.hpp | 1 - include/osmium/io/file_compression.hpp | 9 +- include/osmium/io/file_format.hpp | 9 +- include/osmium/io/reader.hpp | 8 +- include/osmium/object_pointer_collection.hpp | 24 +- include/osmium/osm/crc.hpp | 2 +- include/osmium/osm/item_type.hpp | 21 +- include/osmium/relations/collector.hpp | 11 - include/osmium/tags/filter.hpp | 39 +- include/osmium/tags/matcher.hpp | 123 ++ include/osmium/tags/regex_filter.hpp | 5 +- include/osmium/tags/taglist.hpp | 13 +- include/osmium/tags/tags_filter.hpp | 146 ++ include/osmium/thread/function_wrapper.hpp | 2 +- include/osmium/thread/pool.hpp | 2 +- include/osmium/thread/util.hpp | 2 +- include/osmium/util/file.hpp | 11 +- include/osmium/util/memory_mapping.hpp | 10 +- include/osmium/util/string_matcher.hpp | 429 ++++ include/osmium/version.hpp | 4 +- test/CMakeLists.txt | 8 + test/data-tests/CMakeLists.txt | 4 + test/data-tests/testdata-xml.cpp | 659 +++--- test/include/catch.hpp | 2261 +++++++++++++------- test/t/area/test_assembler.cpp | 143 ++ test/t/geom/test_projection.cpp | 4 +- test/t/index/test_relations_map.cpp | 68 +- test/t/io/test_compression_factory.cpp | 11 +- test/t/io/test_opl_parser.cpp | 153 +- test/t/io/test_reader.cpp | 24 +- test/t/io/test_reader_fileformat.cpp | 10 + test/t/io/test_writer.cpp | 6 +- test/t/io/test_writer_with_mock_compression.cpp | 12 +- test/t/io/test_writer_with_mock_encoder.cpp | 12 +- test/t/osm/test_location.cpp | 8 +- test/t/tags/test_tag_list.cpp | 17 +- test/t/tags/test_tag_matcher.cpp | 93 + test/t/tags/test_tags_filter.cpp | 79 + test/t/util/test_cast_with_assert.cpp | 115 +- test/t/util/test_delta.cpp | 44 +- test/t/util/test_double.cpp | 51 +- test/t/util/test_memory_mapping.cpp | 546 +++-- test/t/util/test_minmax.cpp | 81 +- test/t/util/test_options.cpp | 2 - test/t/util/test_string.cpp | 94 +- test/t/util/test_string_matcher.cpp | 156 ++ 79 files changed, 5736 insertions(+), 3271 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
