diff options
author | Grigori Goronzy <greg@chown.ath.cx> | 2011-08-22 06:30:37 +0200 |
---|---|---|
committer | Grigori Goronzy <greg@chown.ath.cx> | 2015-07-10 10:42:40 +0200 |
commit | 4f2309430ae2f8086e2b46a45fd4f264a2e0a668 (patch) | |
tree | 9d8ae2844f6a00be856e87dd560e1a7eee7a87ea /libass | |
parent | 4803b0a7bc9fee78e9eafb7417fa20f9a21d675f (diff) | |
download | libass-4f2309430ae2f8086e2b46a45fd4f264a2e0a668.tar.bz2 libass-4f2309430ae2f8086e2b46a45fd4f264a2e0a668.tar.xz |
Pass family name as path for memory fonts
This is a bit nicer because we can actually see which physical font
has been selected for a certain logical font.
Diffstat (limited to 'libass')
-rw-r--r-- | libass/ass_font.c | 2 | ||||
-rw-r--r-- | libass/ass_fontselect.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c index ce427814..1aa8fff4 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -145,7 +145,7 @@ static int add_face(ASS_FontSelector *fontsel, ASS_Font *font, uint32_t ch) index, &face); if (error) { ass_msg(font->library, MSGL_WARN, - "Error opening memory font: '%s'", path); + "Error opening memory font: '%s' (size %d)", path, mem_font.len); free(path); return -1; } diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index bb9ec803..32d4dfa0 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -484,7 +484,7 @@ static char *select_font(ASS_FontSelector *priv, ASS_Library *library, if (font_infos[idx].path == NULL) { ASS_FontProvider *provider = font_infos[idx].provider; face->buf = provider->funcs.get_face(font_infos[idx].priv, &face->len); - return strdup(""); // empty string indicates a memory font + return strdup(font_infos[idx].family); } else return strdup(font_infos[idx].path); } @@ -520,7 +520,7 @@ char *ass_font_select(ASS_FontSelector *priv, ASS_Library *library, if (res) ass_msg(library, MSGL_WARN, "fontselect: Using default " "font family: (%s, %d, %d) -> %s, %d", - family, bold, italic, res[0] ? res : "<memory>", *index); + family, bold, italic, res, *index); } if (!res && priv->path_default) { @@ -537,13 +537,13 @@ char *ass_font_select(ASS_FontSelector *priv, ASS_Library *library, if (res) ass_msg(library, MSGL_WARN, "fontselect: Using 'Arial' " "font family: (%s, %d, %d) -> %s, %d", family, bold, - italic, res[0] ? res : "<memory>", *index); + italic, res, *index); } if (res) ass_msg(library, MSGL_V, "fontselect: (%s, %d, %d) -> %s, %d", family, bold, - italic, res[0] ? res : "<memory>", *index); + italic, res, *index); return res; } |