forked from enlightenment/efl
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
This commit is contained in:
parent
6a5e4338a1
commit
ef3b7a72f2
|
@ -7997,7 +7997,8 @@ evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur,
|
||||||
{
|
{
|
||||||
Evas_Object_Textblock *o;
|
Evas_Object_Textblock *o;
|
||||||
Evas_Object_Textblock_Line *ln = NULL;
|
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;
|
Evas_Coord x, y, w, h;
|
||||||
|
|
||||||
if (!cur || !evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
|
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 (!o->formatted.valid) _relayout(cur->obj);
|
||||||
if (!evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
|
if (!evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
|
||||||
_find_layout_item_line_match(cur->obj, cur->node, cur->pos, &ln,
|
_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;
|
if ((!ln) || (!fi)) return EINA_FALSE;
|
||||||
x = ln->par->x + ln->x + fi->parent.x;
|
x = ln->par->x + ln->x + fi->parent.x;
|
||||||
y = ln->par->y + ln->y + ln->baseline + fi->y;
|
y = ln->par->y + ln->y + ln->baseline + fi->y;
|
||||||
|
|
Loading…
Reference in New Issue