From 5570891eb388f15a91c94a088547ff05f607bb02 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 28 Apr 2011 15:02:11 +0000 Subject: [PATCH] Evas font-engine: Fixed rendering of empty text. SVN revision: 59006 --- .../src/lib/engines/common/evas_font_draw.c | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c index 91ef164bcd..c20c921d24 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_draw.c +++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c @@ -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