diff options
author | Oleg Oshmyan <chortos@inbox.lv> | 2021-06-17 16:57:44 +0300 |
---|---|---|
committer | Oleg Oshmyan <chortos@inbox.lv> | 2021-07-10 02:36:31 +0300 |
commit | 2ff663a6f3f0a9209a75116ff549fc78cef2b75c (patch) | |
tree | 7cb8d5da7b0377fc45f2b7013efc81c1d5ed234e /libass/ass_fontselect.c | |
parent | a7f67df5f96f03fab6661d90d716c16e0fab4a21 (diff) | |
download | libass-2ff663a6f3f0a9209a75116ff549fc78cef2b75c.tar.bz2 libass-2ff663a6f3f0a9209a75116ff549fc78cef2b75c.tar.xz |
Pass last-resort-fallback family name directly to get_font_info
Diffstat (limited to 'libass/ass_fontselect.c')
-rw-r--r-- | libass/ass_fontselect.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 40daf85..90fe0dc 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -771,11 +771,12 @@ char *ass_font_select(ASS_FontSelector *priv, ASS_Library *library, * as required for the FontSelector for matching and sorting. * \param lib FreeType library * \param face FreeType face + * \param fallback_family_name family name from outside source, used as last resort * \param info metadata, returned here * \return success */ static bool -get_font_info(FT_Library lib, FT_Face face, bool require_family_name, +get_font_info(FT_Library lib, FT_Face face, const char *fallback_family_name, ASS_FontProviderMetaData *info) { int i; @@ -820,20 +821,20 @@ get_font_info(FT_Library lib, FT_Face face, bool require_family_name, } - if (require_family_name) { - // 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 - if (num_family == 0) + // check if we got a valid family - if not, use + // whatever the font provider or FreeType gives us + if (num_family == 0 && (fallback_family_name || face->family_name)) { + families[0] = + strdup(fallback_family_name ? fallback_family_name : face->family_name); + if (families[0] == NULL) goto error; + num_family++; } + // we absolutely need a name + if (num_family == 0) + goto error; + // calculate sensible slant and weight from style attributes slant = 110 * !!(face->style_flags & FT_STYLE_FLAG_ITALIC); weight = ass_face_get_weight(face); @@ -881,14 +882,14 @@ error: bool ass_get_font_info(ASS_Library *lib, FT_Library ftlib, const char *path, const char *postscript_name, int index, - bool require_family_name, + const char *fallback_family_name, ASS_FontProviderMetaData *info) { FT_Face face = ass_face_open(lib, ftlib, path, postscript_name, index); if (!face) return false; - bool ret = get_font_info(ftlib, face, require_family_name, info); + bool ret = get_font_info(ftlib, face, fallback_family_name, info); if (ret) info->postscript_name = strdup(info->postscript_name); FT_Done_Face(face); @@ -952,7 +953,7 @@ static void process_fontdata(ASS_FontProvider *priv, ASS_Library *library, charmap_magic(library, face); memset(&info, 0, sizeof(ASS_FontProviderMetaData)); - if (!get_font_info(ftlibrary, face, true, &info)) { + if (!get_font_info(ftlibrary, face, NULL, &info)) { ass_msg(library, MSGL_WARN, "Error getting metadata for embedded font '%s'", name); FT_Done_Face(face); |