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.



SVN revision: 62675
This commit is contained in:
ChunEon Park 2011-08-22 03:34:43 +00:00
parent 1bed664303
commit 3bd87ec51a
1 changed files with 7 additions and 11 deletions

View File

@ -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