add a few fixes for gcc

fixes #437
This commit is contained in:
Konstantin Käfer
2014-08-21 15:46:20 +02:00
parent b9c7e1bdd9
commit 1fa3a3e85a
7 changed files with 10 additions and 10 deletions

View File

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

View File

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