RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Move transform_3d() call to get_bitmap_glyph(). 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23191 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2007-05-01 15:12:36 +00:00
parent 3e9be13d66
commit 8ffc803841
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libass/ass_render.c
View File

@ -1276,6 +1276,8 @@ static void get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance
}
}
static void transform_3d(FT_Vector shift, FT_Glyph* glyph, FT_Glyph* glyph2, double frx, double fry, double frz);
/**
* \brief Get normal and outline glyphs from cache (if possible) or font face
* \param index face glyph index
@ -1296,8 +1298,14 @@ static void get_bitmap_glyph(glyph_info_t* info)
info->bm = val->bm;
info->bm_o = val->bm_o;
info->bm_s = val->bm_s;
} else
} else {
FT_Vector shift;
info->bm = info->bm_o = info->bm_s = 0;
// calculating shift vector
shift.x = int_to_d6(info->hash_key.shift_x);
shift.y = int_to_d6(info->hash_key.shift_y);
transform_3d(shift, &info->glyph, &info->outline_glyph, info->frx, info->fry, info->frz);
}
}
/**
@ -1949,7 +1957,6 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
}
for (i = 0; i < text_info.length; ++i) {
FT_Vector shift;
glyph_info_t* info = text_info.glyphs + i;
if (info->hash_key.frx || info->hash_key.fry || info->hash_key.frz) {
@ -1960,14 +1967,6 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
info->hash_key.shift_y = 0;
}
get_bitmap_glyph(info);
if (info->bm == 0) {
// calculating shift vector
shift.x = int_to_d6(info->hash_key.shift_x);
shift.y = int_to_d6(info->hash_key.shift_y);
transform_3d(shift, &info->glyph, &info->outline_glyph, info->frx, info->fry, info->frz);
}
}
}