diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-20 00:51:33 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-25 08:12:31 +0300 |
| commit | 679bfbfb32d6371d6eb405b5e465353c53298c41 (patch) | |
| tree | 262d7f27a10790571fdfcca32d0afaaee7d61cc2 /src/mbgl/text/collision_tile.hpp | |
| parent | 846e57de586355c80ff488fc7fd4f7b9462b465d (diff) | |
| download | qtlocation-mapboxgl-679bfbfb32d6371d6eb405b5e465353c53298c41.tar.gz | |
[core] Simplify CollisionTile::findPlacementScale
Improve findPlacementScale semantics by moving the check if the
placement scale result is bigger than minimum scale out of the function
scope.
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
| -rw-r--r-- | src/mbgl/text/collision_tile.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp index a2c5220fce..186cd19d28 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -54,7 +54,7 @@ public: std::array<float, 4> reverseRotationMatrix; private: - float findPlacementScale(float minPlacementScale, + float findPlacementScale( const Point<float>& anchor, const CollisionBox& box, const Point<float>& blockingAnchor, const CollisionBox& blocking); Box getTreeBox(const Point<float>& anchor, const CollisionBox& box, const float scale = 1.0); |