jpt-archive/glftfont
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix clang warning on std::max

Browse Source
This commit is contained in:
James Turk 2016-10-07 12:10:10 -04:00
parent 4e8b9c2fa3
commit 8f02ca1df2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GLFT_Font.cpp
View File

@ -146,8 +146,8 @@ void GLFT_Font::open(const std::string& filename, unsigned int size)
lineSpace -= widths_[ch]; lineSpace -= widths_[ch];
maxAscent = std::max(face->glyph->bitmap_top, maxAscent); maxAscent = std::max(face->glyph->bitmap_top, maxAscent);
maxDescent = std::max(face->glyph->bitmap.rows - maxDescent = std::max((int)face->glyph->bitmap.rows -
face->glyph->bitmap_top, maxDescent); (int)face->glyph->bitmap_top, maxDescent);
} }
height_ = maxAscent + maxDescent; // calculate height_ for text height_ = maxAscent + maxDescent; // calculate height_ for text

2
Makefile
View File

@ -1,6 +1,6 @@
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Darwix) ifeq ($(UNAME), Darwin)
GL := -framework OpenGL GL := -framework OpenGL
else else
GL := -lGL -lXrandr GL := -lGL -lXrandr