summaryrefslogtreecommitdiff
path: root/src/text/collision.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-18 17:57:51 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-18 17:57:51 +0100
commit98bb797a4adf52993835f016f577ac7de5d56dce (patch)
treee5b59390f1708ffcb4b3846beea5c7e8a914a038 /src/text/collision.cpp
parent25ff0b253f99f401e79ad7e009fd09cd8b5a4314 (diff)
downloadqtlocation-mapboxgl-98bb797a4adf52993835f016f577ac7de5d56dce.tar.gz
explicit names
Diffstat (limited to 'src/text/collision.cpp')
-rw-r--r--src/text/collision.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index 37f065b4b2..1d08b53a2a 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -50,10 +50,11 @@ GlyphBox getMergedGlyphs(const GlyphBoxes &glyphs, bool horizontal,
return mergedGlyphs;
}
-Placement Collision::place(const GlyphBoxes &boxes,
- const CollisionAnchor &anchor,
- float minPlacementScale, float maxPlacementScale,
- float padding, bool horizontal) {
+PlacementProperty Collision::place(const GlyphBoxes &boxes,
+ const CollisionAnchor &anchor,
+ float minPlacementScale,
+ float maxPlacementScale, float padding,
+ bool horizontal) {
float minScale = std::numeric_limits<float>::infinity();
for (const GlyphBox &box : boxes) {
@@ -93,7 +94,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
// Return if the label can never be placed without collision
if (scale < 0) {
- return Placement{};
+ return PlacementProperty{};
}
// Calculate the range it is safe to rotate all glyphs
@@ -102,7 +103,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
float zoom = log(scale) / log(2);
- return Placement{zoom, rotationRange};
+ return PlacementProperty{zoom, rotationRange};
}
float Collision::getPlacementScale(const GlyphBoxes &glyphs,