summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-11 13:08:05 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-12 08:36:30 -0700
commit00a86ba03f8a6bc4ceff62ef984c020733bf0945 (patch)
tree4af9b4a3623d1df6bf052b57d2d72f9780f60ae9
parente79858558d9bdcd3c7366c75be8c160cc939ff2a (diff)
downloadqtlocation-mapboxgl-00a86ba03f8a6bc4ceff62ef984c020733bf0945.tar.gz
[core] Replace auto with actual types
-rw-r--r--src/mbgl/text/collision_tile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp
index c9ae7ab8e0..fe62d978fa 100644
--- a/src/mbgl/text/collision_tile.cpp
+++ b/src/mbgl/text/collision_tile.cpp
@@ -86,8 +86,8 @@ float CollisionTile::placeFeature(const CollisionFeature& feature, const bool al
if (!allowOverlap) {
for (auto it = tree.qbegin(bgi::intersects(getTreeBox(anchor, box))); it != tree.qend(); ++it) {
- const auto& blocking = std::get<1>(*it);
- auto blockingAnchor = util::matrixMultiply(rotationMatrix, blocking.anchor);
+ const CollisionBox& blocking = std::get<1>(*it);
+ Point<float> blockingAnchor = util::matrixMultiply(rotationMatrix, blocking.anchor);
minPlacementScale = findPlacementScale(minPlacementScale, anchor, box, blockingAnchor, blocking);
if (minPlacementScale >= maxScale) return minPlacementScale;