diff options
| author | Werner Lemberg <wl@gnu.org> | 2013-01-22 11:07:07 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2013-01-22 11:07:07 +0100 |
| commit | e0469372be3870a5ad60b2c4586e9c281357bd28 (patch) | |
| tree | a63fd319e1a78dcbe7f81e0326fee0d4c24fb5d4 | |
| parent | 7190098098f7e1021e9e0c5c4103c5f9f657813f (diff) | |
| download | freetype2-e0469372be3870a5ad60b2c4586e9c281357bd28.tar.gz | |
[truetype] Fix font height.
* src/truetype/ttobjs.c (tt_size_reset): The Windows rendering
engine uses rounded values of the ascender and descender to compute
the TrueType font height.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/truetype/ttobjs.c | 7 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2013-01-22 Werner Lemberg <wl@gnu.org> + + [truetype] Fix font height. + + * src/truetype/ttobjs.c (tt_size_reset): The Windows rendering + engine uses rounded values of the ascender and descender to compute + the TrueType font height. + 2013-01-16 Behdad Esfahbod <behdad@behdad.org> [sfnt] Fix optimized sbit loader. diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index c61b218c2..590b66c33 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -4,7 +4,7 @@ /* */ /* Objects manager (body). */ /* */ -/* Copyright 1996-2012 */ +/* Copyright 1996-2013 */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1177,11 +1177,12 @@ FT_PIX_ROUND( FT_MulFix( face->root.ascender, metrics->y_scale ) ); metrics->descender = FT_PIX_ROUND( FT_MulFix( face->root.descender, metrics->y_scale ) ); - metrics->height = - FT_PIX_ROUND( FT_MulFix( face->root.height, metrics->y_scale ) ); metrics->max_advance = FT_PIX_ROUND( FT_MulFix( face->root.max_advance_width, metrics->x_scale ) ); + + /* the height is derived from rounded values */ + metrics->height = metrics->ascender - metrics->descender; } /* compute new transformation */ |