diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2019-03-23 08:30:16 -0500 |
|---|---|---|
| committer | Oleg Oshmyan <chortos@inbox.lv> | 2019-09-26 16:51:09 +0300 |
| commit | 6c2120a7cb4a6fd648ef37ad8f0d961cbd60f500 (patch) | |
| tree | 12c7a08b96de09364811a66847be57a5de844883 /libass | |
| parent | 47e9e994358f17c776f20084d7b9750d3de79068 (diff) | |
| download | libass-6c2120a7cb4a6fd648ef37ad8f0d961cbd60f500.tar.bz2 libass-6c2120a7cb4a6fd648ef37ad8f0d961cbd60f500.tar.xz | |
fontselect: expose the freetype-provided family as well
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_fontselect.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 651fc7a..9c4bb3b 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -766,6 +766,13 @@ 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; @@ -793,15 +800,6 @@ 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 |