Fix ascender/descender scaling

Partially reverts 162a735b6b2dba13022f96db42a3f153cf28033e.

diff --git a/libass/ass_font.c b/libass/ass_font.c
index 3d8120273ae1d3874aca9b95fad7ab99a71a6375..5c92fb25ebb5d3846b7dd140ec7eef60a40812a8 100644 (file)
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -269,7 +269,7 @@ void ass_font_get_asc_desc(ASS_Font *font, uint32_t ch, int *asc,
         FT_Face face = font->faces[i];
         TT_OS2 *os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2);
         if (FT_Get_Char_Index(face, ch)) {
-            int y_scale = face->size->metrics.y_scale * font->scale_y;
+            int y_scale = face->size->metrics.y_scale;
             if (os2) {
                 *asc = FT_MulFix(os2->usWinAscent, y_scale);
                 *desc = FT_MulFix(os2->usWinDescent, y_scale);