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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23041 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2007-04-20 23:11:39 +00:00
parent d9741a0278
commit b9809c1e13
1 changed files with 3 additions and 1 deletions

View File

@ -393,7 +393,7 @@ static ass_image_t* render_text(text_info_t* text_info, int dst_x, int dst_y)
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* event, event_images_t* event_images)
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);
}
}
}