[mapnik-vector-tile] 04/06: Drop patches included upstream.

Bas Couwenberg sebastic at debian.org
Mon Sep 12 08:30:05 UTC 2016


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

sebastic pushed a commit to branch master
in repository mapnik-vector-tile.

commit 796b38c27140048f48e51d82ba4e1ee8b64ae7fe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 12 09:44:31 2016 +0200

    Drop patches included upstream.
---
 debian/changelog                                   |   2 +-
 debian/patches/avoid-unused-variable-warning.patch |  20 -
 debian/patches/decode_geometry.patch               |  29 --
 debian/patches/port-to-protozero-v1.4.2.patch      | 409 ---------------------
 debian/patches/series                              |   3 -
 5 files changed, 1 insertion(+), 462 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 951499c..aed910b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ mapnik-vector-tile (1.2.2+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
-  * Add upstream patches for node-mapnik 3.5.14.
+  * Drop patches included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Sep 2016 09:42:47 +0200
 
diff --git a/debian/patches/avoid-unused-variable-warning.patch b/debian/patches/avoid-unused-variable-warning.patch
deleted file mode 100644
index f036149..0000000
--- a/debian/patches/avoid-unused-variable-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 2ac762171c741fbc054a01adf0793872cf17b3f1 Mon Sep 17 00:00:00 2001
-From: Dane Springmeyer <dane at mapbox.com>
-Date: Tue, 6 Sep 2016 13:31:24 -0700
-Subject: [PATCH] avoid unused variable warning
-
----
- src/vector_tile_featureset_pbf.ipp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/vector_tile_featureset_pbf.ipp
-+++ b/src/vector_tile_featureset_pbf.ipp
-@@ -306,7 +306,7 @@ feature_ptr tile_featureset_pbf<Filter>:
-                     #endif
-                     feature->set_geometry(std::move(geom));
-                 }
--                catch (std::exception const& e)
-+                catch (std::exception const&)
-                 {
-                     // For v1 any invalid geometry errors lets just skip the feature
-                     continue;
diff --git a/debian/patches/decode_geometry.patch b/debian/patches/decode_geometry.patch
deleted file mode 100644
index adf1389..0000000
--- a/debian/patches/decode_geometry.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Add decode_geometry prototypes.
-Author: Dane Springmeyer <dane at mapbox.com>
-Bug: https://github.com/mapbox/mapnik-vector-tile/issues/217
-
---- a/src/vector_tile_geometry_decoder.cpp
-+++ b/src/vector_tile_geometry_decoder.cpp
-@@ -22,6 +22,22 @@ template mapnik::geometry::geometry<std:
-                                                                                 std::int64_t tile_y,
-                                                                                 double scale_x, 
-                                                                                 double scale_y);
-+template mapnik::geometry::geometry<double> decode_geometry<double>(GeometryPBF & paths, 
-+                                                                    int32_t geom_type, 
-+                                                                    unsigned version,
-+                                                                    double tile_x,
-+                                                                    double tile_y,
-+                                                                    double scale_x, 
-+                                                                    double scale_y,
-+                                                                    mapnik::box2d<double> const& bbox);
-+template mapnik::geometry::geometry<std::int64_t> decode_geometry<std::int64_t>(GeometryPBF & paths, 
-+                                                                                int32_t geom_type, 
-+                                                                                unsigned version,
-+                                                                                std::int64_t tile_x,
-+                                                                                std::int64_t tile_y,
-+                                                                                double scale_x, 
-+                                                                                double scale_y,
-+                                                                                mapnik::box2d<double> const& bbox);
- 
- } // end ns vector_tile_impl
- 
diff --git a/debian/patches/port-to-protozero-v1.4.2.patch b/debian/patches/port-to-protozero-v1.4.2.patch
deleted file mode 100644
index c86fcaa..0000000
--- a/debian/patches/port-to-protozero-v1.4.2.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From de6628c00c1b757f397450f2ea3ae20018fe0e4b Mon Sep 17 00:00:00 2001
-From: Dane Springmeyer <dane at mapbox.com>
-Date: Fri, 9 Sep 2016 10:03:00 -0700
-Subject: [PATCH] port to protozero v1.4.2
-
----
- Makefile                             |  2 +-
- src/vector_tile_composite.hpp        |  8 ++++----
- src/vector_tile_datasource_pbf.ipp   |  6 +++---
- src/vector_tile_featureset_pbf.ipp   | 10 +++++-----
- src/vector_tile_geometry_decoder.hpp |  6 ++++--
- src/vector_tile_geometry_decoder.ipp | 35 ++++++++++++++++++-----------------
- src/vector_tile_is_valid.hpp         |  2 +-
- src/vector_tile_load_tile.hpp        | 10 +++++-----
- test/geometry_visual_test.cpp        |  2 +-
- test/unit/load/merge.cpp             | 18 +++++++++---------
- test/utils/encoding_util.cpp         |  2 +-
- test/utils/round_trip.cpp            |  2 +-
- test/vector_tile.cpp                 |  2 +-
- test/vector_tile_pbf.cpp             |  2 +-
- 14 files changed, 55 insertions(+), 52 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@ MAPNIK_PLUGINDIR := $(shell mapnik-confi
- BUILDTYPE ?= Release
- 
- CLIPPER_REVISION=ac8d6bf2517f46c05647b5c19cac113fb180ffb4
--PROTOZERO_REVISION=v1.3.0
-+PROTOZERO_REVISION=v1.4.2
- GYP_REVISION=3464008
- 
- all: libvtile
---- a/src/vector_tile_composite.hpp
-+++ b/src/vector_tile_composite.hpp
-@@ -57,8 +57,8 @@ void composite(merc_tile & target_vt,
-         while (tile_message.next(Tile_Encoding::LAYERS))
-         {
-             bool reencode_layer = reencode_tile;
--            auto data_pair = tile_message.get_data();
--            protozero::pbf_reader layer_message(data_pair);
-+            const auto data_view = tile_message.get_view();
-+            protozero::pbf_reader layer_message(data_view);
-             if (!layer_message.next(Layer_Encoding::NAME))
-             {
-                 continue;
-@@ -68,7 +68,7 @@ void composite(merc_tile & target_vt,
-             
-             if (!reencode_layer)
-             {
--                target_vt.append_layer_buffer(data_pair.first, data_pair.second, layer_name);
-+                target_vt.append_layer_buffer(data_view.data(), data_view.size(), layer_name);
-             }
-             
-             if (target_vt.has_layer(layer_name))
-@@ -76,7 +76,7 @@ void composite(merc_tile & target_vt,
-                 continue;
-             }
- 
--            protozero::pbf_reader layer_pbf(data_pair);
-+            protozero::pbf_reader layer_pbf(data_view);
-             auto ds = std::make_shared<mapnik::vector_tile_impl::tile_datasource_pbf>(
-                         layer_pbf,
-                         vt->x(),
---- a/src/vector_tile_datasource_pbf.ipp
-+++ b/src/vector_tile_datasource_pbf.ipp
-@@ -74,14 +74,14 @@ tile_datasource_pbf::tile_datasource_pbf
-                 break;
-             case Layer_Encoding::FEATURES:
-                 {
--                    auto data_pair = layer_.get_data();
--                    protozero::pbf_reader check_feature(data_pair);
-+                    const auto data_view = layer_.get_view();
-+                    protozero::pbf_reader check_feature(data_view);
-                     while (check_feature.next(Feature_Encoding::RASTER))
-                     {
-                         type_ = datasource::Raster;
-                         check_feature.skip();
-                     }
--                    protozero::pbf_reader f_msg(data_pair);
-+                    protozero::pbf_reader f_msg(data_view);
-                     features_.push_back(f_msg);
-                 }
-                 break;
---- a/src/vector_tile_featureset_pbf.ipp
-+++ b/src/vector_tile_featureset_pbf.ipp
-@@ -123,7 +123,7 @@ feature_ptr tile_featureset_pbf<Filter>:
-         int32_t geometry_type = 0; // vector_tile::Tile_GeomType_UNKNOWN
-         bool has_geometry = false;
-         bool has_geometry_type = false;
--        std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator> geom_itr;
-+        GeometryPBF::pbf_itr geom_itr;
-         bool has_raster = false;
-         std::unique_ptr<mapnik::image_reader> reader;
-         while (f.next())
-@@ -136,10 +136,10 @@ feature_ptr tile_featureset_pbf<Filter>:
-                 case 2:
-                     {
-                         auto tag_iterator = f.get_packed_uint32();
--                        for (auto _i = tag_iterator.first; _i != tag_iterator.second;)
-+                        for (auto _i = tag_iterator.begin(); _i != tag_iterator.end();)
-                         {
-                             std::size_t key_name = *(_i++);
--                            if (_i == tag_iterator.second)
-+                            if (_i == tag_iterator.end())
-                             {
-                                 throw std::runtime_error("Vector Tile has a feature with an odd number of tags, therefore the tile is invalid.");
-                             }
-@@ -186,8 +186,8 @@ feature_ptr tile_featureset_pbf<Filter>:
-                             throw std::runtime_error("Vector Tile has a feature with multiple raster fields, it must have only one of them");
-                         }
-                         has_raster = true;
--                        auto image_buffer = f.get_data();
--                        reader = std::unique_ptr<mapnik::image_reader>(mapnik::get_image_reader(image_buffer.first, image_buffer.second));
-+                        auto image_buffer = f.get_view();
-+                        reader = std::unique_ptr<mapnik::image_reader>(mapnik::get_image_reader(image_buffer.data(), image_buffer.size()));
-                     }
-                     break;
-                 case 4:
---- a/src/vector_tile_geometry_decoder.hpp
-+++ b/src/vector_tile_geometry_decoder.hpp
-@@ -31,7 +31,8 @@ class GeometryPBF
- {
- public:
-     using value_type = std::int64_t;
--    using pbf_itr = std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator >;
-+    using iterator_type = protozero::pbf_reader::const_uint32_iterator;
-+    using pbf_itr = protozero::iterator_range<iterator_type>;
-     
-     explicit GeometryPBF(pbf_itr const& geo_iterator);
- 
-@@ -53,7 +54,8 @@ public:
-     command ring_next(value_type & rx, value_type & ry, bool skip_lineto_zero);
- 
- private:
--    std::pair< protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator > geo_iterator_;
-+    iterator_type geo_itr_;
-+    iterator_type geo_end_itr_;
-     value_type x, y;
-     value_type ox, oy;
-     uint32_t length;
---- a/src/vector_tile_geometry_decoder.ipp
-+++ b/src/vector_tile_geometry_decoder.ipp
-@@ -554,7 +554,8 @@ void decode_polygon(mapnik::geometry::ge
- } // end ns detail
- 
- GeometryPBF::GeometryPBF(pbf_itr const& geo_iterator)
--    : geo_iterator_(geo_iterator),
-+    : geo_itr_(geo_iterator.begin()),
-+      geo_end_itr_(geo_iterator.end()),
-       x(0),
-       y(0),
-       ox(0), 
-@@ -571,9 +572,9 @@ typename GeometryPBF::command GeometryPB
- {
-     if (length == 0) 
-     {
--        if (geo_iterator_.first != geo_iterator_.second)
-+        if (geo_itr_ != geo_end_itr_)
-         {
--            uint32_t cmd_length = static_cast<uint32_t>(*geo_iterator_.first++);
-+            uint32_t cmd_length = static_cast<uint32_t>(*geo_itr_++);
-             cmd = cmd_length & 0x7;
-             length = cmd_length >> 3;
-             if (cmd == move_to)
-@@ -611,8 +612,8 @@ typename GeometryPBF::command GeometryPB
-     // If an exception occurs it will likely be a end_of_buffer_exception with the text:
-     // "end of buffer exception"
-     // While this error message is not verbose a try catch here would slow down processing.
--    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
--    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
-+    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-+    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-     detail::move_cursor(x, y, dx, dy);
-     rx = x;
-     ry = y;
-@@ -625,9 +626,9 @@ typename GeometryPBF::command GeometryPB
- {
-     if (length == 0)
-     {
--        if (geo_iterator_.first != geo_iterator_.second)
-+        if (geo_itr_ != geo_end_itr_)
-         {
--            uint32_t cmd_length = static_cast<uint32_t>(*geo_iterator_.first++);
-+            uint32_t cmd_length = static_cast<uint32_t>(*geo_itr_++);
-             cmd = cmd_length & 0x7;
-             length = cmd_length >> 3;
-             if (cmd == move_to)
-@@ -642,8 +643,8 @@ typename GeometryPBF::command GeometryPB
-                 // If an exception occurs it will likely be a end_of_buffer_exception with the text:
-                 // "end of buffer exception"
-                 // While this error message is not verbose a try catch here would slow down processing.
--                int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
--                int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
-+                int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-+                int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-                 detail::move_cursor(x, y, dx, dy);
-                 rx = x;
-                 ry = y;
-@@ -680,8 +681,8 @@ typename GeometryPBF::command GeometryPB
-     // If an exception occurs it will likely be a end_of_buffer_exception with the text:
-     // "end of buffer exception"
-     // While this error message is not verbose a try catch here would slow down processing.
--    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
--    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
-+    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-+    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-     if (skip_lineto_zero && dx == 0 && dy == 0)
-     {
-         // We are going to skip this vertex as the point doesn't move call line_next again
-@@ -699,9 +700,9 @@ typename GeometryPBF::command GeometryPB
- {
-     if (length == 0)
-     {
--        if (geo_iterator_.first != geo_iterator_.second)
-+        if (geo_itr_ != geo_end_itr_)
-         {
--            uint32_t cmd_length = static_cast<uint32_t>(*geo_iterator_.first++);
-+            uint32_t cmd_length = static_cast<uint32_t>(*geo_itr_++);
-             cmd = cmd_length & 0x7;
-             length = cmd_length >> 3;
-             if (cmd == move_to)
-@@ -716,8 +717,8 @@ typename GeometryPBF::command GeometryPB
-                 // If an exception occurs it will likely be a end_of_buffer_exception with the text:
-                 // "end of buffer exception"
-                 // While this error message is not verbose a try catch here would slow down processing.
--                int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
--                int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
-+                int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-+                int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-                 detail::move_cursor(x, y, dx, dy);
-                 rx = x;
-                 ry = y;
-@@ -759,8 +760,8 @@ typename GeometryPBF::command GeometryPB
-     // If an exception occurs it will likely be a end_of_buffer_exception with the text:
-     // "end of buffer exception"
-     // While this error message is not verbose a try catch here would slow down processing.
--    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
--    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_iterator_.first++));
-+    int32_t dx = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-+    int32_t dy = protozero::decode_zigzag32(static_cast<uint32_t>(*geo_itr_++));
-     if (skip_lineto_zero && dx == 0 && dy == 0)
-     {
-         // We are going to skip this vertex as the point doesn't move call ring_next again
---- a/src/vector_tile_is_valid.hpp
-+++ b/src/vector_tile_is_valid.hpp
-@@ -201,7 +201,7 @@ inline void feature_is_valid(protozero::
-                 }
-                 has_raster = true;
-                 ++raster_feature_count;
--                feature_msg.get_data();
-+                feature_msg.get_view();
-                 break;
-             default:
-                 errors.insert(FEATURE_HAS_UNKNOWN_TAG);
---- a/src/vector_tile_load_tile.hpp
-+++ b/src/vector_tile_load_tile.hpp
-@@ -62,8 +62,8 @@ void merge_from_buffer(merc_tile & t, co
-         {
-             case Tile_Encoding::LAYERS:
-                 {
--                    auto layer_data = tile_msg.get_data();
--                    protozero::pbf_reader layer_props_msg(layer_data);
-+                    const auto layer_view = tile_msg.get_view();
-+                    protozero::pbf_reader layer_props_msg(layer_view);
-                     auto layer_info = get_layer_name_and_version(layer_props_msg);
-                     std::string const& layer_name = layer_info.first;
-                     std::uint32_t version = layer_info.second;
-@@ -78,7 +78,7 @@ void merge_from_buffer(merc_tile & t, co
-                         {
-                             errors.insert(TILE_REPEATED_LAYER_NAMES);
-                         }
--                        protozero::pbf_reader layer_valid_msg(layer_data);
-+                        protozero::pbf_reader layer_valid_msg(layer_view);
-                         layer_is_valid(layer_valid_msg, errors);
-                         if (!errors.empty())
-                         {
-@@ -94,7 +94,7 @@ void merge_from_buffer(merc_tile & t, co
-                     if (upgrade && version == 1)
-                     {
-                             // v1 tiles will be converted to v2
--                            protozero::pbf_reader layer_msg(layer_data);
-+                            protozero::pbf_reader layer_msg(layer_view);
-                             ds_vec.push_back(std::make_shared<mapnik::vector_tile_impl::tile_datasource_pbf>(
-                                         layer_msg,
-                                         t.x(),
-@@ -104,7 +104,7 @@ void merge_from_buffer(merc_tile & t, co
-                     }
-                     else
-                     {
--                        t.append_layer_buffer(layer_data.first, layer_data.second, layer_name);
-+                        t.append_layer_buffer(layer_view.data(), layer_view.size(), layer_name);
-                     }
-                 }
-                 break;
---- a/test/geometry_visual_test.cpp
-+++ b/test/geometry_visual_test.cpp
-@@ -68,7 +68,7 @@ void clip_geometry(mapnik::Map const& ma
-         {
-             protozero::pbf_reader feature_reader = layer_reader.get_message();
-             int32_t geometry_type = mapnik::vector_tile_impl::Geometry_Type::UNKNOWN; 
--            std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator> geom_itr;
-+            mapnik::vector_tile_impl::GeometryPBF::pbf_itr geom_itr;
-             while (feature_reader.next())
-             {
-                 if (feature_reader.tag() == mapnik::vector_tile_impl::Feature_Encoding::GEOMETRY)
---- a/test/unit/load/merge.cpp
-+++ b/test/unit/load/merge.cpp
-@@ -24,15 +24,15 @@ TEST_CASE( "merge_from_compressed_buffer
-         protozero::pbf_reader tile_msg(tile.get_buffer());
-         while (tile_msg.next(mapnik::vector_tile_impl::Tile_Encoding::LAYERS))
-         {
--            auto layer_data = tile_msg.get_data();
--            protozero::pbf_reader layer_props_msg(layer_data);
-+            const auto layer_view = tile_msg.get_view();
-+            protozero::pbf_reader layer_props_msg(layer_view);
-             auto layer_info = mapnik::vector_tile_impl::get_layer_name_and_version(layer_props_msg);
-             std::string const& layer_name = layer_info.first;
-             std::uint32_t version = layer_info.second;
-             CHECK(layer_name == "water");
-             CHECK(version == 1);
-             std::set<mapnik::vector_tile_impl::validity_error> errors;
--            protozero::pbf_reader layer_valid_msg(layer_data);
-+            protozero::pbf_reader layer_valid_msg(layer_view);
-             layer_is_valid(layer_valid_msg, errors);
-             CHECK(errors.size() == 0);
-         }
-@@ -51,15 +51,15 @@ TEST_CASE( "merge_from_compressed_buffer
-         protozero::pbf_reader tile_msg(tile2.get_buffer());
-         while (tile_msg.next(mapnik::vector_tile_impl::Tile_Encoding::LAYERS))
-         {
--            auto layer_data = tile_msg.get_data();
--            protozero::pbf_reader layer_props_msg(layer_data);
-+            const auto layer_view = tile_msg.get_view();
-+            protozero::pbf_reader layer_props_msg(layer_view);
-             auto layer_info = mapnik::vector_tile_impl::get_layer_name_and_version(layer_props_msg);
-             std::string const& layer_name = layer_info.first;
-             std::uint32_t version = layer_info.second;
-             CHECK(layer_name == "water");
-             CHECK(version == 2);
-             std::set<mapnik::vector_tile_impl::validity_error> errors;
--            protozero::pbf_reader layer_valid_msg(layer_data);
-+            protozero::pbf_reader layer_valid_msg(layer_view);
-             layer_is_valid(layer_valid_msg, errors);
-             CHECK(errors.size() == 0);
-         }
-@@ -79,15 +79,15 @@ TEST_CASE( "merge_from_compressed_buffer
-         protozero::pbf_reader tile_msg(tile.get_buffer());
-         while (tile_msg.next(mapnik::vector_tile_impl::Tile_Encoding::LAYERS))
-         {
--            auto layer_data = tile_msg.get_data();
--            protozero::pbf_reader layer_props_msg(layer_data);
-+            const auto layer_view = tile_msg.get_view();
-+            protozero::pbf_reader layer_props_msg(layer_view);
-             auto layer_info = mapnik::vector_tile_impl::get_layer_name_and_version(layer_props_msg);
-             std::string const& layer_name = layer_info.first;
-             std::uint32_t version = layer_info.second;
-             CHECK(layer_name == "layer");
-             CHECK(version == 2);
-             std::set<mapnik::vector_tile_impl::validity_error> errors;
--            protozero::pbf_reader layer_valid_msg(layer_data);
-+            protozero::pbf_reader layer_valid_msg(layer_view);
-             layer_is_valid(layer_valid_msg, errors);
-             CHECK(errors.size() == 0);
-         }
---- a/test/utils/encoding_util.cpp
-+++ b/test/utils/encoding_util.cpp
-@@ -65,7 +65,7 @@ std::string compare_pbf(mapnik::geometry
-     REQUIRE(mapnik::vector_tile_impl::encode_geometry_pbf(g, feature_writer, x, y));
-     protozero::pbf_reader feature_reader(feature_str);
-     int32_t geometry_type = mapnik::vector_tile_impl::Geometry_Type::UNKNOWN; 
--    std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator> geom_itr;
-+    mapnik::vector_tile_impl::GeometryPBF::pbf_itr geom_itr;
-     while (feature_reader.next())
-     {
-         if (feature_reader.tag() == mapnik::vector_tile_impl::Feature_Encoding::GEOMETRY)
---- a/test/utils/round_trip.cpp
-+++ b/test/utils/round_trip.cpp
-@@ -70,7 +70,7 @@ mapnik::geometry::geometry<double> round
-     }
-     protozero::pbf_reader feature_reader = layer_reader.get_message();
-     int32_t geometry_type = mapnik::vector_tile_impl::Geometry_Type::UNKNOWN; 
--    std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator> geom_itr;
-+    mapnik::vector_tile_impl::GeometryPBF::pbf_itr geom_itr;
-     while (feature_reader.next())
-     {
-         if (feature_reader.tag() == mapnik::vector_tile_impl::Feature_Encoding::GEOMETRY)
---- a/test/vector_tile.cpp
-+++ b/test/vector_tile.cpp
-@@ -71,7 +71,7 @@ TEST_CASE("vector tile from simplified g
-     REQUIRE(layer_reader.next(mapnik::vector_tile_impl::Layer_Encoding::FEATURES));
-     protozero::pbf_reader feature_reader = layer_reader.get_message();
-     int32_t geometry_type = mapnik::vector_tile_impl::Geometry_Type::UNKNOWN; 
--    std::pair<protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator> geom_itr;
-+    mapnik::vector_tile_impl::GeometryPBF::pbf_itr geom_itr;
-     while (feature_reader.next())
-     {
-         if (feature_reader.tag() == mapnik::vector_tile_impl::Feature_Encoding::GEOMETRY)
---- a/test/vector_tile_pbf.cpp
-+++ b/test/vector_tile_pbf.cpp
-@@ -414,7 +414,7 @@ TEST_CASE("pbf vector tile from simplifi
-       while (!found && pbf_feature.next(4))
-       {
-           found = true;
--          std::pair< protozero::pbf_reader::const_uint32_iterator, protozero::pbf_reader::const_uint32_iterator > geom_itr = pbf_feature.get_packed_uint32();
-+          mapnik::vector_tile_impl::GeometryPBF::pbf_itr geom_itr = pbf_feature.get_packed_uint32();
-           mapnik::vector_tile_impl::GeometryPBF geoms(geom_itr);
-           auto geom = mapnik::vector_tile_impl::decode_geometry<double>(geoms, f.type(), 2, tile_x, tile_y, scale, -1.0 * scale);
-           unsigned int n_err = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 04ae822..107f9ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 test_using_created_tif.patch
 use-protozero-package.patch
-decode_geometry.patch
 skip-tests-for-missing-data.patch
-avoid-unused-variable-warning.patch
-port-to-protozero-v1.4.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git



More information about the Pkg-grass-devel mailing list