From 15a3582483e0701d5c539d6b7d35b6326e8826ea Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 22 Aug 2011 08:23:04 +0000 Subject: [PATCH] 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 ' (yeah, git is better). or SVN: 'svn merge -c .' This will prevent this kind of erros from happenning in the future. Also, plesae compile before committing. SVN revision: 62678 --- .../lib/engines/common/evas_font_default_walk.x | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x b/legacy/evas/src/lib/engines/common/evas_font_default_walk.x index 298694d163..56807b8487 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x +++ b/legacy/evas/src/lib/engines/common/evas_font_default_walk.x @@ -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