From 91adbe748075f469a91bc6b543d77e9e4b429f7b Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <brammanis@gmail.com>
Date: Fri, 30 Jun 2017 15:38:43 -0400
Subject: [core] port pitch-label collision hack

https://github.com/mapbox/mapbox-gl-js/pull/4781/commits/81363951ed56c54f331ffc8d88e4e5079226a224
---
 src/mbgl/text/collision_tile.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mbgl/text/collision_tile.hpp')

diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp
index 161bc3a688..cf6db458ce 100644
--- a/src/mbgl/text/collision_tile.hpp
+++ b/src/mbgl/text/collision_tile.hpp
@@ -56,7 +56,7 @@ public:
 
 private:
     float findPlacementScale(
-            const Point<float>& anchor, const CollisionBox& box,
+            const Point<float>& anchor, const CollisionBox& box, const float boxMaxScale,
             const Point<float>& blockingAnchor, const CollisionBox& blocking);
     Box getTreeBox(const Point<float>& anchor, const CollisionBox& box, const float scale = 1.0);
 
-- 
cgit v1.2.1