Keep reselected fonts in an array, adding new ones to the end. Glyph

lookup prefers earlier opened fonts.

This way glyph lookup is stable, which means that:
 - cache cleanup is never required after font reselecting;
 - a single unrecognized char won't change the appearance of all the others.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21635 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 1 deletions

diff --git a/libass/ass_font.h b/libass/ass_font.h
index 7c3a50d347..5d986e9f0b 100644
--- a/libass/ass_font.h
+++ b/libass/ass_font.h
@@ -31,10 +31,13 @@ typedef struct ass_font_desc_s {
 	unsigned italic;
 } ass_font_desc_t;
 
+#define ASS_FONT_MAX_FACES 10
+
 typedef struct ass_font_s {
 	ass_font_desc_t desc;
 	FT_Library ftlibrary;
-	FT_Face face;
+	FT_Face faces[ASS_FONT_MAX_FACES];
+	int n_faces;
 	FT_Matrix m; // current transformation
 	FT_Vector v; // current shift
 	int size;