diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-12 02:27:01 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-12 02:27:01 +0000 |
| commit | eb96cc741e216ac2d0383671f280fe7484cfd334 (patch) | |
| tree | 6fdbd52157691fb13de8a9df1f6bcb15d7fe4167 /libass | |
| parent | 46c4f6ae9fa020db770a5e96ffd7c1e946aae625 (diff) | |
| download | mpv-eb96cc741e216ac2d0383671f280fe7484cfd334.tar.bz2 mpv-eb96cc741e216ac2d0383671f280fe7484cfd334.tar.xz | |
Do not try to guess font metrics based on its bounding box.
It was originally a workaround for fonts with bad ascender/descender values,
but it breaks display of some otherwise valid fonts (bugzilla 987), so
reverted.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25688 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_font.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c index 37bec8b50e..4339621cd6 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -248,14 +248,8 @@ void ass_font_get_asc_desc(ass_font_t* font, uint32_t ch, int* asc, int* desc) for (i = 0; i < font->n_faces; ++i) { FT_Face face = font->faces[i]; if (FT_Get_Char_Index(face, ch)) { - int v, v2; - v = face->size->metrics.ascender; - v2 = FT_MulFix(face->bbox.yMax, face->size->metrics.y_scale); - *asc = (v > v2 * 0.9) ? v : v2; - - v = - face->size->metrics.descender; - v2 = - FT_MulFix(face->bbox.yMin, face->size->metrics.y_scale); - *desc = (v > v2 * 0.9) ? v : v2; + *asc = face->size->metrics.ascender; + *desc = - face->size->metrics.descender; return; } } |