Ticket #989: revert-font-size-hack.patch

libass/ass_font.c

@@ -196 +196 @@
 
 static void face_set_size(FT_Face face, double size)
 {
-#if (FREETYPE_MAJOR > 2) || ((FREETYPE_MAJOR == 2) && (FREETYPE_MINOR > 1))
-        TT_HoriHeader *hori = FT_Get_Sfnt_Table(face, ft_sfnt_hhea);
-        TT_OS2 *os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2);
-        double mscale = 1.;
-        FT_Size_RequestRec rq;
-        FT_Size_Metrics *m = &face->size->metrics;
-        // VSFilter uses metrics from TrueType OS/2 table
-        // The idea was borrowed from asa (http://asa.diac24.net)
-        if (hori && os2) {
-                int hori_height = hori->Ascender - hori->Descender;
-                int os2_height = os2->usWinAscent + os2->usWinDescent;
-                if (hori_height && os2_height)
-                        mscale = (double)hori_height / os2_height;
-        }
-        memset(&rq, 0, sizeof(rq));
-        rq.type = FT_SIZE_REQUEST_TYPE_REAL_DIM;
-        rq.width = 0;
-        rq.height = double_to_d6(size * mscale);
-        rq.horiResolution = rq.vertResolution = 0;
-        FT_Request_Size(face, &rq);
-        m->ascender /= mscale;
-        m->descender /= mscale;
-        m->height /= mscale;
-#else
         FT_Set_Char_Size(face, 0, double_to_d6(size), 0, 0);
-#endif
 }
 
 /**