Mercurial > mplayer.hg

diff libass/ass_render.c @ 21460:62bd8e0d3a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Open embedded fonts directly from memory. FontConfig 2.4.2 (released yesterday) supports scanning fonts with FcFreeTypeQueryFace without writing them to disk. With earlier FontConfig versions, the old mechanism is used.
author eugeni
date Sun, 03 Dec 2006 18:24:11 +0000
parents 7af6c25a0cfc
children 8174acbf0633
line wrap: on
line diff
--- a/libass/ass_render.c	Sun Dec 03 18:22:07 2006 +0000
+++ b/libass/ass_render.c	Sun Dec 03 18:24:11 2006 +0000
@@ -561,7 +561,7 @@
 	else if (val == 1) val = 110; //italic
 	desc.italic = val;
 
-	render_context.font = ass_font_new(priv->ftlibrary, priv->fontconfig_priv, &desc);
+	render_context.font = ass_font_new(priv->library, priv->ftlibrary, priv->fontconfig_priv, &desc);
 	
 	if (render_context.font)
 		change_font_size(render_context.font_size);
@@ -1928,7 +1928,7 @@
 
 	if (priv->fontconfig_priv)
 		fontconfig_done(priv->fontconfig_priv);
-	priv->fontconfig_priv = fontconfig_init(priv->library, default_family, default_font);
+	priv->fontconfig_priv = fontconfig_init(priv->library, priv->ftlibrary, default_family, default_font);
 
 	return !!priv->fontconfig_priv;
 }