diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 17:28:25 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-05 16:13:26 +0300 |
commit | 55581b6e61aa0f3bdbcbe4e2a1b8d67a52031aa1 (patch) | |
tree | 609b1cb5f2ef1ed2ad49a7b2254fc0226017ae2b /src/mbgl/text/collision_feature.cpp | |
parent | 9b34997986698f22e1aa0799896591c17d2ac1a3 (diff) | |
download | qtlocation-mapboxgl-55581b6e61aa0f3bdbcbe4e2a1b8d67a52031aa1.tar.gz |
[core] Remove unused CollisionBox::offset
Diffstat (limited to 'src/mbgl/text/collision_feature.cpp')
-rw-r--r-- | src/mbgl/text/collision_feature.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/collision_feature.cpp b/src/mbgl/text/collision_feature.cpp index c708f834da..fbf259d1db 100644 --- a/src/mbgl/text/collision_feature.cpp +++ b/src/mbgl/text/collision_feature.cpp @@ -54,9 +54,9 @@ CollisionFeature::CollisionFeature(const GeometryCoordinates& line, const float yMin = std::min({tl.y, tr.y, bl.y, br.y}); const float yMax = std::max({tl.y, tr.y, bl.y, br.y}); - boxes.emplace_back(anchor.point, Point<float>{ 0, 0 }, xMin, yMin, xMax, yMax); + boxes.emplace_back(anchor.point, xMin, yMin, xMax, yMax); } else { - boxes.emplace_back(anchor.point, Point<float>{ 0, 0 }, x1, y1, x2, y2); + boxes.emplace_back(anchor.point, x1, y1, x2, y2); } } } @@ -155,7 +155,7 @@ void CollisionFeature::bboxifyLabel(const GeometryCoordinates& line, GeometryCoo 0 : (boxDistanceToAnchor - firstBoxOffset) * 0.8; - boxes.emplace_back(boxAnchor, boxAnchor - convertPoint<float>(anchorPoint), -boxSize / 2, -boxSize / 2, boxSize / 2, boxSize / 2, paddedAnchorDistance, boxSize / 2); + boxes.emplace_back(boxAnchor, -boxSize / 2, -boxSize / 2, boxSize / 2, boxSize / 2, paddedAnchorDistance, boxSize / 2); } } |