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.

diff --git a/libass/ass_font.c b/libass/ass_font.c
index 14790b49dfbf9463c26ac03d02534ee7d1f35d22..0f53d8a1c96d4ef604d3fcc0cceaa80e981d763f 100644 (file)
--- 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;
         }
     }