From bac2852ff70604b705a1d2e47f7f39f20f38e0a7 Mon Sep 17 00:00:00 2001 From: rcombs Date: Wed, 16 Sep 2020 23:37:17 -0500 Subject: Revert "fontselect: expose the freetype-provided family as well" This reverts commit 6c2120a7cb4a6fd648ef37ad8f0d961cbd60f500. This turned out never to actually be necessary, wasn't actually consistent with vsfilter, and could result in script authors relying on accidentally-introduced deviations from vsfilter font matching. --- libass/ass_fontselect.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libass') diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 66569a8..fed0415 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -766,13 +766,6 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info) if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) return false; - if (face->family_name) { - families[0] = strdup(face->family_name); - if (families[0] == NULL) - goto error; - num_family++; - } - for (i = 0; i < num_names; i++) { FT_SfntName name; @@ -800,6 +793,15 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info) num_family++; } } + + } + + // check if we got a valid family - if not use whatever FreeType gives us + if (num_family == 0 && face->family_name) { + families[0] = strdup(face->family_name); + if (families[0] == NULL) + goto error; + num_family++; } // we absolutely need a name -- cgit v1.2.3