summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-28 17:39:08 +0200
committerwm4 <wm4@nowhere>2015-08-28 17:39:08 +0200
commit102e28d6b7fc54b71fe223f4acf7cbdd373b5c02 (patch)
tree39fa09fcf411a2f06aac18a8fb367d87cc199113
parent7930755de2136b9e10dcce4bf8d45aa40a0b4810 (diff)
downloadlibass-102e28d6b7fc54b71fe223f4acf7cbdd373b5c02.tar.bz2
libass-102e28d6b7fc54b71fe223f4acf7cbdd373b5c02.tar.xz
font: fix broken charmap fallback handling
An earlier commit added this code to avoid adding font faces multiple times. In this form, it breaks the "Trying all charmaps" fallback case, which can lead to text being rendered as boxes. Return the font that is going to contain the missing glyph instead. The calling code will check again, and run the fallback if necessary.
-rw-r--r--libass/ass_font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c
index 9a81dca..0ba79ad 100644
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -154,7 +154,7 @@ static int add_face(ASS_FontSelector *fontsel, ASS_Font *font, uint32_t ch)
ass_msg(font->library, MSGL_INFO,
"Got a font face that already is available! Skipping.");
free(path);
- return -1;
+ return i;
}
}