This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium.
commit c1b49446dc66cd8668932b1fd165d33465e69fa2 Merge: 374778a c64b95a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jul 4 14:19:14 2015 +0200 Merge tag 'upstream/2.2.0' Upstream version 2.2.0 .travis.yml | 79 +-- CHANGELOG.md | 44 +- CMakeLists.txt | 65 +- appveyor.yml | 70 +- benchmarks/osmium_benchmark_count.cpp | 7 +- benchmarks/osmium_benchmark_count_tag.cpp | 5 +- cmake/FindOsmium.cmake | 2 +- doc/CMakeLists.txt | 2 - doc/Doxyfile.in | 4 +- doc/README.md | 2 +- examples/osmium_count.cpp | 7 +- examples/osmium_create_node_cache.cpp | 3 +- examples/osmium_serdump.cpp | 3 +- examples/osmium_use_node_cache.cpp | 3 +- include/mmap_for_windows.hpp | 103 --- include/osmium/area/assembler.hpp | 24 +- include/osmium/area/detail/segment_list.hpp | 2 +- include/osmium/area/multipolygon_collector.hpp | 24 +- include/osmium/builder/builder.hpp | 4 +- include/osmium/builder/osm_object_builder.hpp | 14 +- include/osmium/geom/factory.hpp | 164 +++-- include/osmium/geom/geos.hpp | 49 +- include/osmium/geom/haversine.hpp | 2 +- include/osmium/geom/mercator_projection.hpp | 1 + include/osmium/geom/rapid_geojson.hpp | 190 ++++++ include/osmium/geom/tile.hpp | 101 +++ include/osmium/geom/wkb.hpp | 2 +- include/osmium/handler/dump.hpp | 2 +- .../mmap_vector_anon.hpp => bool_vector.hpp} | 59 +- include/osmium/index/detail/mmap_vector_anon.hpp | 21 +- include/osmium/index/detail/mmap_vector_base.hpp | 82 ++- include/osmium/index/detail/mmap_vector_file.hpp | 26 +- include/osmium/index/detail/typed_mmap.hpp | 229 ------- include/osmium/index/detail/vector_map.hpp | 10 +- include/osmium/index/detail/vector_multimap.hpp | 34 + include/osmium/index/index.hpp | 2 +- include/osmium/index/map.hpp | 16 +- include/osmium/index/map/sparse_mem_table.hpp | 4 +- include/osmium/io/bzip2_compression.hpp | 2 +- include/osmium/io/detail/pbf.hpp | 31 - include/osmium/io/detail/pbf_input_format.hpp | 3 +- include/osmium/io/detail/pbf_output_format.hpp | 64 +- include/osmium/io/detail/pbf_parser.hpp | 25 +- include/osmium/io/detail/pbf_stringtable.hpp | 2 +- .../io/detail/{pbf.hpp => pbf_type_conv.hpp} | 31 +- include/osmium/io/detail/read_write.hpp | 2 +- include/osmium/io/detail/xml_input_format.hpp | 1 + include/osmium/io/detail/xml_output_format.hpp | 2 +- include/osmium/io/gzip_compression.hpp | 2 +- include/osmium/io/reader.hpp | 2 +- include/osmium/memory/buffer.hpp | 18 + include/osmium/memory/item.hpp | 2 +- include/osmium/osm/changeset.hpp | 1 + include/osmium/osm/diff_object.hpp | 29 +- include/osmium/osm/item_type.hpp | 20 + include/osmium/osm/node_ref.hpp | 2 +- include/osmium/osm/object.hpp | 1 + include/osmium/osm/relation.hpp | 7 +- include/osmium/osm/timestamp.hpp | 15 + include/osmium/osm/types.hpp | 21 - include/osmium/osm/types_from_string.hpp | 116 ++++ include/osmium/relations/collector.hpp | 4 +- include/osmium/thread/pool.hpp | 3 +- include/osmium/thread/queue.hpp | 31 +- include/osmium/thread/sorted_queue.hpp | 4 +- include/osmium/util/cast.hpp | 3 +- include/osmium/util/data_file.hpp | 192 ++++++ .../detail/mmap_vector_anon.hpp => util/delta.hpp} | 71 +- include/osmium/util/file.hpp | 118 ++++ include/osmium/util/memory_mapping.hpp | 723 +++++++++++++++++++++ include/osmium/util/minmax.hpp | 123 ++++ include/osmium/util/string.hpp | 42 +- include/osmium/util/verbose_output.hpp | 2 +- scripts/travis_install.sh | 26 + scripts/travis_script.sh | 31 + test/CMakeLists.txt | 96 ++- test/data-tests/testdata-xml.cpp | 8 +- test/t/area/test_area_id.cpp | 32 +- test/t/area/test_node_ref_segment.cpp | 208 +++--- test/t/basic/test_box.cpp | 158 ++--- test/t/basic/test_entity_bits.cpp | 36 +- test/t/basic/test_location.cpp | 278 ++++---- test/t/basic/test_node_ref.cpp | 94 +-- test/t/basic/test_object_comparisons.cpp | 268 ++++---- test/t/basic/test_timestamp.cpp | 87 ++- test/t/basic/test_types_from_string.cpp | 90 +++ test/t/buffer/test_buffer_node.cpp | 122 ++-- test/t/buffer/test_buffer_purge.cpp | 14 +- test/t/geom/test_exception.cpp | 16 + test/t/geom/test_factory_with_projection.cpp | 42 +- test/t/geom/test_mercator.cpp | 58 +- test/t/geom/test_projection.cpp | 18 + test/t/geom/test_tile.cpp | 93 +++ test/t/geom/test_tile_data.hpp | 475 ++++++++++++++ test/t/geom/test_wkt.cpp | 8 + test/t/index/test_id_to_location.cpp | 138 ++-- test/t/index/test_typed_mmap.cpp | 99 --- test/t/io/test_bzip2.cpp | 34 +- test/t/io/test_file_formats.cpp | 480 +++++++------- test/t/tags/test_filter.cpp | 302 ++++----- test/t/tags/test_operators.cpp | 92 +-- test/t/tags/test_tag_list.cpp | 114 ++-- test/t/thread/test_pool.cpp | 7 +- test/t/util/test_data_file.cpp | 81 +++ test/t/util/test_delta.cpp | 44 ++ test/t/util/test_double.cpp | 50 +- test/t/util/test_file.cpp | 69 ++ test/t/util/test_memory_mapping.cpp | 393 +++++++++++ test/t/util/test_minmax.cpp | 68 ++ test/t/util/test_options.cpp | 74 +-- test/t/util/test_string.cpp | 107 +-- 111 files changed, 5265 insertions(+), 2321 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.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