[MPlayer-cvslog] r23041 - trunk/libass/ass_render.c

[eugeni]

Author: eugeni
Date: Sat Apr 21 01:11:39 2007
New Revision: 23041

Modified:
   trunk/libass/ass_render.c

Log:
Because of the outline glyph cache it is now possible for glyph_info_t to have
both non-zero glyph and bitmap at the same time. In that case, bitmap should
not be generated anew.


Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Sat Apr 21 01:11:39 2007
@@ -393,7 +393,7 @@ static ass_image_t* render_text(text_inf
 	ass_image_t** tail = &head;
 
 	for (i = 0; i < text_info->length; ++i) {
-		if (text_info->glyphs[i].glyph) {
+		if (text_info->glyphs[i].glyph && text_info->glyphs[i].bm == 0) {
 			if ((text_info->glyphs[i].symbol == '\n') || (text_info->glyphs[i].symbol == 0))
 				continue;
 			error = glyph_to_bitmap(ass_renderer->synth_priv,
@@ -1950,11 +1950,13 @@ static int ass_render_event(ass_event_t*
 			FT_Vector shift;
 			glyph_info_t* info = text_info.glyphs + i;
 
+			if (info->bm == 0) {
 			// calculating shift vector
 			shift.x = int_to_d6(info->pos.x + device_x - center.x);
 			shift.y = - int_to_d6(info->pos.y + device_y - center.y);
 
 			transform_3d(shift, &info->glyph, &info->outline_glyph, info->frx, info->fry, info->frz);
+			}
 		}
 	}