From 92327c799186e22e3e74cd332ae272556483420b Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Mon, 19 Mar 2012 23:00:12 +0100
Subject: GRAPHICS: Render TTF glyphs at the right locations.

Or at least using the fields used by the FreeType examples.
---
 graphics/fonts/ttf.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'graphics/fonts/ttf.cpp')

diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 5e3ed44926..7505f7913e 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -395,11 +395,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, FT_UInt &slot, uint chr) {
 
 	FT_Glyph_Metrics &metrics = _face->glyph->metrics;
 
-	glyph.xOffset = ftFloor26_6(metrics.horiBearingX);
+	glyph.xOffset = _face->glyph->bitmap_left;
 	int xMax = glyph.xOffset + ftCeil26_6(metrics.width);
-	glyph.yOffset = _ascent - ftFloor26_6(metrics.horiBearingY);
+	glyph.yOffset = _ascent - _face->glyph->bitmap_top;
 
-	glyph.advance = ftCeil26_6(metrics.horiAdvance);
+	glyph.advance = ftCeil26_6(_face->glyph->advance.x);
 
 	// In case we got a negative xMin we adjust that, this might make some
 	// characters make a bit odd, but it's the only way we can assure no
-- 
cgit v1.2.3