raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=27ae94596f10d34e00241ab61896053fbe8c7686
commit 27ae94596f10d34e00241ab61896053fbe8c7686 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Wed Aug 27 17:37:01 2014 +0900 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 --- src/lib/evas/canvas/evas_object_textblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index b8f539b..9cd26b1 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -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); } --
