From 248ea3c1aba84fb8ae2f7021deebae64b967b9c6 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 9 Jun 2014 18:10:28 +0200 Subject: GRAPHICS: Allow negative xOffset in TTF. This should improve the visual looks of many fonts. However, it might result in the first line of the glyph to be drawn left of the position specified in drawChar. --- graphics/fonts/ttf.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'graphics/fonts/ttf.cpp') diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp index 4b63c6c60f..ba57613601 100644 --- a/graphics/fonts/ttf.cpp +++ b/graphics/fonts/ttf.cpp @@ -454,25 +454,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const { if (_face->glyph->format != FT_GLYPH_FORMAT_BITMAP) return false; - FT_Glyph_Metrics &metrics = _face->glyph->metrics; - glyph.xOffset = _face->glyph->bitmap_left; - int xMax = glyph.xOffset + ftCeil26_6(metrics.width); glyph.yOffset = _ascent - _face->glyph->bitmap_top; 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 - // invalid memory writes with the current font API - if (glyph.xOffset < 0) { - xMax -= glyph.xOffset; - glyph.xOffset = 0; - - if (xMax > glyph.advance) - glyph.advance = xMax; - } - const FT_Bitmap &bitmap = _face->glyph->bitmap; glyph.image.create(bitmap.width, bitmap.rows, PixelFormat::createFormatCLUT8()); -- cgit v1.2.3