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

evas textblock - fix inconsistent ascent/descent return ptr checks 

ascent/descent are always non-null in usage of
_layout_item_ascent_descent_adjust() so don't check for them.

fix CID 1099704
This commit is contained in:
Carsten Haitzler 2014-08-27 17:37:01 +09:00
parent 4124ed6946
commit 27ae94596f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -2627,10 +2627,8 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj,
}
}
if (ascent && (asc > *ascent))
*ascent = asc;
if (descent && (desc > *descent))
*descent = desc;
if (asc > *ascent) *ascent = asc;
if (desc > *descent) *descent = desc;
if (fmt) _layout_format_ascent_descent_adjust(eo_obj, ascent, descent, fmt);
}