diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-26 17:42:34 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-26 17:42:34 +0200 |
commit | 7dcc061ac5e3b9594dfd52a33c8aff3ac5356e57 (patch) | |
tree | 3a938d63b7537a334f99e30652e2ebdecc6cb849 /src/text | |
parent | fe5f121bc4f04a36e5c1e30bca21bc946065e217 (diff) | |
parent | f4929b0e6ffe671fc8e73683bf565922b18800c3 (diff) | |
download | qtlocation-mapboxgl-7dcc061ac5e3b9594dfd52a33c8aff3ac5356e57.tar.gz |
Merge pull request #437 from mapbox/fix-gcc
Make linux fails
Diffstat (limited to 'src/text')
-rw-r--r-- | src/text/collision.cpp | 4 | ||||
-rw-r--r-- | src/text/rotation_range.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/text/collision.cpp b/src/text/collision.cpp index 89e91d6844..6326bea825 100644 --- a/src/text/collision.cpp +++ b/src/text/collision.cpp @@ -166,10 +166,10 @@ float Collision::getPlacementScale(const GlyphBoxes &glyphs, float minPlacementS float s4 = (ob.br.y - nb.tl.y + padding) / (na.y - oa.y); // scale at which new box is to the bottom of old box - if (isnan(s1) || isnan(s2)) { + if (std::isnan(s1) || std::isnan(s2)) { s1 = s2 = 1; } - if (isnan(s3) || isnan(s4)) { + if (std::isnan(s3) || std::isnan(s4)) { s3 = s4 = 1; } diff --git a/src/text/rotation_range.cpp b/src/text/rotation_range.cpp index 3ebdfe91cb..664ea9c709 100644 --- a/src/text/rotation_range.cpp +++ b/src/text/rotation_range.cpp @@ -95,7 +95,7 @@ rotatingRotatingCollisions(const CollisionRect &a, const CollisionRect &b, std::vector<float> f; for (size_t i = 0; i < c.size(); i++) { // Check if they are close enough to collide - if (!isnan(c[i]) && d_sq <= e[i]) { + if (!std::isnan(c[i]) && d_sq <= e[i]) { // So far, angles have been calulated as relative to the vector // between anchors. // Convert the angles to angles from north. |