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((int)face->glyph->bitmap.rows -
+        maxDescent = std::max(face->glyph->bitmap.rows -
-                                (int)face->glyph->bitmap_top, maxDescent);
+                                face->glyph->bitmap_top, maxDescent);
     }
 
     height_ = maxAscent + maxDescent;   // calculate height_ for text

GLFT_Font.hpp

@@ -39,11 +39,7 @@
 #ifndef GLFT_FONT_HPP
 #define GLFT_FONT_HPP
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
 #include <GL/gl.h>
-#endif
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

LICENSE

@@ -1,23 +0,0 @@
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright 
-      notice, this list of conditions and the following disclaimer in the 
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the GLFT_Font nor the names of its contributors
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,13 +1,5 @@
-UNAME := $(shell uname)
-
-ifeq ($(UNAME), Darwin)
-	GL := -framework OpenGL
-else
-	GL := -lGL -lXrandr
-endif
-
 test: test.cpp GLFT_Font.cpp
-	g++ GLFT_Font.cpp test.cpp -o test -Wall -pedantic -lglfw $(GL) -lfreetype -pthread `freetype-config --cflags` 
+	g++ GLFT_Font.cpp test.cpp -o test -Wall -pedantic -lglfw -lGL -lfreetype -pthread -lXrandr `freetype-config --cflags` 
 
 glftfont.tar.gz: 
 	tar -czf glftfont.tar.gz GLFT_Font.cpp GLFT_Font.hpp index.html README test.cpp Makefile

README

@@ -1,9 +1,36 @@
-GLFT_Font
+// GLFT_Font (http://polimath.com/blog/code/glft_font/)
-  by James Turk (james.p.turk@gmail.com)
+//  by James Turk (james.p.turk@gmail.com)
-  Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl)
+//  Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl)
-
+//
-Version 0.2.2 - Released 28 February 2011 - Fixed linux compilation.
+// Version 0.2.2 - Released 28 February 2011 - Fixed linux compilation.
-Version 0.2.1 - Released 2 March 2008 - Updated contact information.
+// Version 0.2.1 - Released 2 March 2008 - Updated contact information.
-Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, 
+// Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, 
-                                       Changed vsprintf to vsnprintf
+//                                       Changed vsprintf to vsnprintf
-Version 0.1.0 - Released  1 July 2005 - Initial Release
+// Version 0.1.0 - Released  1 July 2005 - Initial Release
+//
+// Copyright (c) 2005-2008, James Turk
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met:
+//
+//    * Redistributions of source code must retain the above copyright notice, 
+//      this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above copyright 
+//      notice, this list of conditions and the following disclaimer in the 
+//      documentation and/or other materials provided with the distribution.
+//    * Neither the name of the GLFT_Font nor the names of its contributors
+//      may be used to endorse or promote products derived from this software 
+//      without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+// POSSIBILITY OF SUCH DAMAGE.