summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_tile.hpp
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2017-06-30 15:38:43 -0400
committerAnsis Brammanis <brammanis@gmail.com>2017-07-10 13:09:34 -0400
commit91adbe748075f469a91bc6b543d77e9e4b429f7b (patch)
treeefaaee45056a634daad278d2f054a932a828e6aa /src/mbgl/text/collision_tile.hpp
parent9034544932c81201d71e3043be785bc2b251042a (diff)
downloadqtlocation-mapboxgl-91adbe748075f469a91bc6b543d77e9e4b429f7b.tar.gz
[core] port pitch-label collision hack
https://github.com/mapbox/mapbox-gl-js/pull/4781/commits/81363951ed56c54f331ffc8d88e4e5079226a224
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
-rw-r--r--src/mbgl/text/collision_tile.hpp2
1 files changed, 1 insertions, 1 deletions
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);