summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2020-10-17 21:40:27 +0300
committerOleg Oshmyan <chortos@inbox.lv>2020-10-18 05:07:09 +0300
commit67a4ca003729aad821a097a84cfd11b7c16228ea (patch)
treee7bd3bcee8c0df115507dc71e68d98761f9292ee
parent0aec12b3576e93f8387992de73bca99ab6e50d2f (diff)
downloadlibass-67a4ca003729aad821a097a84cfd11b7c16228ea.tar.bz2
libass-67a4ca003729aad821a097a84cfd11b7c16228ea.tar.xz
Ignore font substitution when splitting combined bitmaps
Well, that was easy. font->desc.family is the raw family name from FontName/\fn, barring the leading @ for vertical fonts. So, for reference, even if the script requests two different font names and neither exists on the system and font fallback picks the same font for both, is_new_bm_run will treat them as distinct. This is indeed the desired behaviour that matches VSFilter.
-rw-r--r--libass/ass_render.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index b00f22a..ce9503a 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1858,11 +1858,9 @@ fix_glyph_scaling(ASS_Renderer *priv, GlyphInfo *glyph)
*/
static bool is_new_bm_run(GlyphInfo *info, GlyphInfo *last)
{
- // FIXME: Don't break on glyph substitutions
return !last || info->effect || info->drawing_text || last->drawing_text ||
strcmp(last->font->desc.family, info->font->desc.family) ||
last->font->desc.vertical != info->font->desc.vertical ||
- last->face_index != info->face_index ||
last->font_size != info->font_size ||
last->c[0] != info->c[0] ||
last->c[1] != info->c[1] ||