summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2011-07-14 20:49:44 +0200
committerGrigori Goronzy <greg@blackbox>2011-07-15 15:00:14 +0200
commitfa291a3269ee0fa76a17c976439a900b29084314 (patch)
tree05ef33dc672400b6b9535a1f764f6c6c1812ba39
parentb1f12a86374015305347ce83cad96f2eb35b0212 (diff)
downloadlibass-fa291a3269ee0fa76a17c976439a900b29084314.tar.bz2
libass-fa291a3269ee0fa76a17c976439a900b29084314.tar.xz
Revert @font ascender/descender hack
This was introduced with commit e051ab. After re-evaluation, it seems to be rather wrong. Windows appears to use the same ascender as horizontal rendering, except for the first line. We don't have this special handling of the first line, but apart from that, everything is similar to Windows now. Verified with a couple of popular CJK fonts, such as MS Mincho, Meiryo, etc.
-rw-r--r--libass/ass_font.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c
index 14790b4..0f53d8a 100644
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -274,9 +274,6 @@ void ass_font_get_asc_desc(ASS_Font *font, uint32_t ch, int *asc,
*asc = FT_MulFix(face->ascender, y_scale);
*desc = FT_MulFix(-face->descender, y_scale);
}
- if (font->desc.vertical && ch >= VERTICAL_LOWER_BOUND) {
- *asc = FT_MulFix(face->max_advance_width, y_scale);
- }
return;
}
}