fix android and Release builds

This commit is contained in:
Ansis Brammanis
2015-04-02 13:33:50 -07:00
parent 1dcd1cf509
commit 68ae21d8f4
2 changed files with 7 additions and 7 deletions

View File

@@ -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;

View File

@@ -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<unsigned int>(anchor.segment) < line.size());
const Coordinate &next = line[anchor.segment];
angle += -std::atan2(next.x - anchor.x, next.y - anchor.y) + M_PI / 2;
}