From 68ae21d8f4baf254842b847d24c8c2697a4ccbef Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 2 Apr 2015 13:33:50 -0700 Subject: [PATCH] fix android and Release builds --- src/mbgl/text/collision_feature.hpp | 12 ++++++------ src/mbgl/text/quads.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index 9d8a42662..06056c2a2 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 anchor; + vec2 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; diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index c2bb3d822..42b01b748 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -21,7 +21,7 @@ SymbolQuads getIconQuads(Anchor &anchor, const PositionedIcon &shapedIcon, float angle = layout.icon.rotate * M_PI / 180.0f; if (alongLine) { - assert(anchor.segment < line.size()); + assert(static_cast(anchor.segment) < line.size()); const Coordinate &next = line[anchor.segment]; angle += -std::atan2(next.x - anchor.x, next.y - anchor.y) + M_PI / 2; }