raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=acbcc7da6a0297323adc3b1bc6d63c8b1009373d

commit acbcc7da6a0297323adc3b1bc6d63c8b1009373d
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sun Feb 9 19:39:30 2014 +0900

    in case font_instance is null in text_props... avoid using it
---
 src/lib/evas/canvas/evas_object_textblock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index c717ac4..caf7c55 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10747,8 +10747,10 @@ evas_object_textblock_render(Evas_Object *eo_obj 
EINA_UNUSED,
                          { \
                             Evas_Object_Textblock_Text_Item *titr = \
                               (Evas_Object_Textblock_Text_Item *)itr; \
-                            yoff = \
-                              
evas_common_font_instance_max_ascent_get(titr->text_props.font_instance) +\
+                            int ascent = 0; \
+                            if (titr->text_props.font_instance) \
+                              ascent = 
evas_common_font_instance_max_ascent_get(titr->text_props.font_instance); \
+                            yoff = ascent + \
                               (itr->format->valign * (ln->h - itr->h)); \
                          } \
                        else yoff = itr->format->valign * (ln->h - itr->h); \

-- 


Reply via email to