Evas font: Revert last 2 commits by Hermet (62659, 62675).

SPANK SPANK, they broke compilation. Please use the builtin revert
functions when you revert commits. Either:
GIT: 'git revert <commit hash>' (yeah, git is better).
or
SVN: 'svn merge -c <revision> .'

This will prevent this kind of erros from happenning in the future.

Also, plesae compile before committing.

SVN revision: 62678
This commit is contained in:
Tom Hacohen 2011-08-22 08:23:04 +00:00
parent 3bd87ec51a
commit 15a3582483
1 changed files with 7 additions and 7 deletions

View File

@ -53,21 +53,21 @@
/*FIXME: doc */
#ifdef OT_SUPPORT
# define EVAS_FONT_WALK_X_OFF \
(EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*_ot_itr))
(EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_X_OFF_GET(*_ot_itr)))
# define EVAS_FONT_WALK_Y_OFF \
(EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_Y_OFF_GET(*_ot_itr))
(EVAS_FONT_ROUND_26_6_TO_INT(EVAS_FONT_OT_Y_OFF_GET(*_ot_itr)))
# define EVAS_FONT_WALK_POS \
(EVAS_FONT_OT_POS_GET(*_ot_itr) - text_props->text_offset)
(EVAS_FONT_OT_POS_GET(*_ot_itr) - text_props->text_offset)
# define EVAS_FONT_WALK_POS_NEXT \
((!EVAS_FONT_WALK_IS_LAST) ? \
(EVAS_FONT_OT_POS_GET(*(_ot_itr + 1)) \
- 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) ? \
(EVAS_FONT_OT_POS_GET(*(_ot_itr - 1)) \
- text_props->text_offset : \
EVAS_FONT_OT_POS_GET(*(_ot_itr - 1)) - \
text_props->text_offset : \
EVAS_FONT_WALK_POS \
)
#else