kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas font-engine: Fixed rendering of empty text. 

SVN revision: 59006
This commit is contained in:
Tom Hacohen 2011-04-28 15:02:11 +00:00
parent c5b107f144
commit 5570891eb3
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -525,14 +525,17 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
* doing it */
fi = text_props->font_instance;
evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size)
if (fi)
{
FTLOCK();
FT_Activate_Size(fi->ft.size);
FTUNLOCK();
fi->src->current_size = fi->size;
evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size)
{
FTLOCK();
FT_Activate_Size(fi->ft.size);
FTUNLOCK();
fi->src->current_size = fi->size;
}
}
#endif
@ -844,14 +847,17 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, con
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
* doing it */
fi = text_props->font_instance;
evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size)
if (fi)
{
FTLOCK();
FT_Activate_Size(fi->ft.size);
FTUNLOCK();
fi->src->current_size = fi->size;
evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size)
{
FTLOCK();
FT_Activate_Size(fi->ft.size);
FTUNLOCK();
fi->src->current_size = fi->size;
}
}
#endif