From d4d50f7a7fc337b60d8e9917a62be6d2ed033826 Mon Sep 17 00:00:00 2001 From: hermet Date: Mon, 22 Aug 2011 03:34:43 +0000 Subject: [PATCH] evas/evas_font - revert exceptin handlings requested by TAsn I do understand. :p then, it seems no need to set the _ot_itr = NULL in EVAS_FONT_WALK_TEXT_START. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@62675 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/engines/common/evas_font_default_walk.x | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/lib/engines/common/evas_font_default_walk.x b/src/lib/engines/common/evas_font_default_walk.x index 043e50b..298694d 100644 --- a/src/lib/engines/common/evas_font_default_walk.x +++ b/src/lib/engines/common/evas_font_default_walk.x @@ -53,25 +53,21 @@ /*FIXME: doc */ #ifdef OT_SUPPORT # define EVAS_FONT_WALK_X_OFF \ - ((_ot_itr) ? \ - (EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*_ot_itr)) : \ - 0) + (EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*_ot_itr)) # define EVAS_FONT_WALK_Y_OFF \ - ((_ot_itr) ? \ - (EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_Y_OFF_GET(*_ot_itr)) : \ - 0) + (EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_Y_OFF_GET(*_ot_itr)) # define EVAS_FONT_WALK_POS \ - ((_ot_itr) ? \ - (EVAS_FONT_OT_POS_GET(*_ot_itr) - text_props->text_offset) : \ - 0) + (EVAS_FONT_OT_POS_GET(*_ot_itr) - text_props->text_offset) # define EVAS_FONT_WALK_POS_NEXT \ ((!EVAS_FONT_WALK_IS_LAST) ? \ - ((_ot_itr) ? EVAS_FONT_OT_POS_GET(*(_ot_itr + 1)) : 0) - text_props->text_offset : \ + (EVAS_FONT_OT_POS_GET(*(_ot_itr + 1)) \ + - text_props->text_offset : \ EVAS_FONT_WALK_POS \ ) # define EVAS_FONT_WALK_POS_PREV \ ((char_index > 0) ? \ - ((_ot_itr) ? EVAS_FONT_OT_POS_GET(*(_ot_itr - 1)) : 0) - text_props->text_offset : \ + (EVAS_FONT_OT_POS_GET(*(_ot_itr - 1)) \ + - text_props->text_offset : \ EVAS_FONT_WALK_POS \ ) #else -- 2.7.4