From ef3b7a72f29e47628a3c0ef49a978f2d769c1e73 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 23 Feb 2011 16:49:31 +0000 Subject: [PATCH] Evas textblock: Fix the false-positive strict-aliasing issue with gcc. Only happens with some versions of gcc. I think it's a false positive because both of the items are compatible. SVN revision: 57267 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 0524f53f7d..d47433cf56 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -7997,7 +7997,8 @@ evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, { Evas_Object_Textblock *o; Evas_Object_Textblock_Line *ln = NULL; - Evas_Object_Textblock_Format_Item *fi = NULL; + Evas_Object_Textblock_Format_Item *fi; + Evas_Object_Textblock_Item *it = NULL; Evas_Coord x, y, w, h; if (!cur || !evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE; @@ -8005,7 +8006,8 @@ evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, if (!o->formatted.valid) _relayout(cur->obj); if (!evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE; _find_layout_item_line_match(cur->obj, cur->node, cur->pos, &ln, - (Evas_Object_Textblock_Item **) &fi); + (Evas_Object_Textblock_Item **) &it); + fi = _ITEM_FORMAT(it); if ((!ln) || (!fi)) return EINA_FALSE; x = ln->par->x + ln->x + fi->parent.x; y = ln->par->y + ln->y + ln->baseline + fi->y;