evas/evas_font - revert exceptin handlings
authorhermet <hermet@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 22 Aug 2011 03:34:43 +0000 (03:34 +0000)
committerhermet <hermet@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 22 Aug 2011 03:34:43 +0000 (03:34 +0000)
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: http://svn.enlightenment.org/svn/e/trunk/evas@62675 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/engines/common/evas_font_default_walk.x

index 043e50b..298694d 100644 (file)
 /*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