From e5c08800ebe3793ef1049cea82f54c4f7e722c2d Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 21 Nov 2016 10:48:10 +0100 Subject: [PATCH 1/2] update deps/mapbox/variant --- deps/mapbox/variant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/mapbox/variant b/deps/mapbox/variant index 84a426a31..9a115c5eb 160000 --- a/deps/mapbox/variant +++ b/deps/mapbox/variant @@ -1 +1 @@ -Subproject commit 84a426a31ad3b63c4b8f8d189841e19af48cda40 +Subproject commit 9a115c5eb3c09509c70a57b25b283b6e1cbba919 From 994a327c7f9c27df1120733a653ec5d0a2f5c5ce Mon Sep 17 00:00:00 2001 From: talaj Date: Fri, 25 Nov 2016 13:31:55 +0100 Subject: [PATCH 2/2] remove superfluous declaration --- include/mapnik/text/placement_finder.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp index 3b02d8924..83e8a04b3 100644 --- a/include/mapnik/text/placement_finder.hpp +++ b/include/mapnik/text/placement_finder.hpp @@ -67,8 +67,6 @@ private: bool single_line_placement(vertex_cache &pp, text_upright_e orientation); // Moves dx pixels but makes sure not to fall of the end. void path_move_dx(vertex_cache & pp, double dx); - // Normalize angle in range [-pi, +pi]. - static double normalize_angle(double angle); // Adjusts user defined spacing to place an integer number of labels. double get_spacing(double path_length, double layout_width) const; // Checks for collision.