summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-11 12:40:54 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-12 08:36:30 -0700
commite6296479f017145df47daea8ed19b440dc70eedc (patch)
tree64fada0a9fc5e6a2f46cc5401dad26f935923d03 /src
parente4a63684ecba9dfe7dc639b496a7578deb53cf0f (diff)
downloadqtlocation-mapboxgl-e6296479f017145df47daea8ed19b440dc70eedc.tar.gz
[core] Code formatting
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/text/collision_tile.cpp6
-rw-r--r--src/mbgl/text/collision_tile.hpp4
2 files changed, 5 insertions, 5 deletions
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<flo
return minPlacementScale;
}
-float CollisionTile::placeFeature(const CollisionFeature &feature, const bool allowOverlap, const bool avoidEdges) {
+float CollisionTile::placeFeature(const CollisionFeature& feature, const bool allowOverlap, const bool avoidEdges) {
float minPlacementScale = minScale;
@@ -124,7 +124,7 @@ float CollisionTile::placeFeature(const CollisionFeature &feature, const bool al
return minPlacementScale;
}
-void CollisionTile::insertFeature(CollisionFeature &feature, const float minPlacementScale, const bool ignorePlacement) {
+void CollisionTile::insertFeature(CollisionFeature& feature, const float minPlacementScale, const bool ignorePlacement) {
for (auto& box : feature.boxes) {
box.placementScale = minPlacementScale;
}
@@ -143,7 +143,7 @@ void CollisionTile::insertFeature(CollisionFeature &feature, const float minPlac
}
-Box CollisionTile::getTreeBox(const Point<float> &anchor, const CollisionBox &box, const float scale) {
+Box CollisionTile::getTreeBox(const Point<float>& 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<IndexedSubfeature> queryRenderedSymbols(const float minX, const float minY, const float maxX, const float maxY, const float scale);