From e6296479f017145df47daea8ed19b440dc70eedc Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 11 May 2016 12:40:54 -0700 Subject: [core] Code formatting --- src/mbgl/text/collision_tile.cpp | 6 +++--- src/mbgl/text/collision_tile.hpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp index ef7e9ab850..2a2d4083e7 100644 --- a/src/mbgl/text/collision_tile.cpp +++ b/src/mbgl/text/collision_tile.cpp @@ -77,7 +77,7 @@ float CollisionTile::findPlacementScale(float minPlacementScale, const Point &anchor, const CollisionBox &box, const float scale) { +Box CollisionTile::getTreeBox(const Point& anchor, const CollisionBox& box, const float scale) { return Box{ CollisionPoint{ anchor.x + box.x1 / scale, diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp index df769ac203..fe25a6ee5d 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -39,8 +39,8 @@ class CollisionTile { public: explicit CollisionTile(PlacementConfig); - float placeFeature(const CollisionFeature& feature, const bool allowOverlap, const bool avoidEdges); - void insertFeature(CollisionFeature& feature, const float minPlacementScale, const bool ignorePlacement); + float placeFeature(const CollisionFeature&, const bool allowOverlap, const bool avoidEdges); + void insertFeature(CollisionFeature&, const float minPlacementScale, const bool ignorePlacement); std::vector queryRenderedSymbols(const float minX, const float minY, const float maxX, const float maxY, const float scale); -- cgit v1.2.1