diff options
author | rcombs <rcombs@rcombs.me> | 2020-09-16 23:37:17 -0500 |
---|---|---|
committer | Oleg Oshmyan <chortos@inbox.lv> | 2020-09-19 17:49:41 +0300 |
commit | bac2852ff70604b705a1d2e47f7f39f20f38e0a7 (patch) | |
tree | 40ba60d9b73986264fa8d4c55a56b4c9bf47091d /libass | |
parent | 9b04e56ff6e1ed82bc48ac7307e627bdbbaf082d (diff) | |
download | libass-bac2852ff70604b705a1d2e47f7f39f20f38e0a7.tar.bz2 libass-bac2852ff70604b705a1d2e47f7f39f20f38e0a7.tar.xz |
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.
Diffstat (limited to 'libass')
-rw-r--r-- | libass/ass_fontselect.c | 16 |
1 files changed, 9 insertions, 7 deletions
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 |