fix clang warning on std::max

2016-10-07 12:10:10 -04:00 · 2016-10-07 12:10:10 -04:00 · 8f02ca1df2
commit 8f02ca1df2
parent 4e8b9c2fa3
2 changed files with 3 additions and 3 deletions
--- a/GLFT_Font.cpp
+++ b/GLFT_Font.cpp
@ -146,8 +146,8 @@ void GLFT_Font::open(const std::string& filename, unsigned int size)
        lineSpace -= widths_[ch];

        maxAscent = std::max(face->glyph->bitmap_top, maxAscent);
-        maxDescent = std::max(face->glyph->bitmap.rows -
-                                face->glyph->bitmap_top, maxDescent);
+        maxDescent = std::max((int)face->glyph->bitmap.rows -
+                                (int)face->glyph->bitmap_top, maxDescent);
    }

    height_ = maxAscent + maxDescent;   // calculate height_ for text
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 UNAME := $(shell uname)

-ifeq ($(UNAME), Darwix)
+ifeq ($(UNAME), Darwin)
 	GL := -framework OpenGL
 else
 	GL := -lGL -lXrandr