diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-04-02 13:33:50 -0700 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-04-02 13:33:50 -0700 |
commit | 68ae21d8f4baf254842b847d24c8c2697a4ccbef (patch) | |
tree | 128dab925d4c79b253afcfe88b0d474df8edee96 /src/mbgl/text/collision_feature.hpp | |
parent | 1dcd1cf509b657fa9dc63ab706659b2cfd5f592d (diff) | |
download | qtlocation-mapboxgl-68ae21d8f4baf254842b847d24c8c2697a4ccbef.tar.gz |
fix android and Release builds
Diffstat (limited to 'src/mbgl/text/collision_feature.hpp')
-rw-r--r-- | src/mbgl/text/collision_feature.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index 9d8a426625..06056c2a20 100644 --- a/src/mbgl/text/collision_feature.hpp +++ b/src/mbgl/text/collision_feature.hpp @@ -13,17 +13,17 @@ namespace mbgl { anchor(_anchor), x1(_x1), y1(_y1), x2(_x2), y2(_y2), maxScale(_maxScale) {} // the box is centered around the anchor point - const vec2<float> anchor; + vec2<float> anchor; // distances to the edges from the anchor - const float x1; - const float y1; - const float x2; - const float y2; + float x1; + float y1; + float x2; + float y2; // the box is only valid for scales < maxScale. // The box does not block other boxes at scales >= maxScale; - const float maxScale; + float maxScale; // the scale at which the label can first be shown float placementScale = 0.0f; |