From aab511d31978bb30094ee5c72d35721f09ef4142 Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Tue, 15 May 2007 15:41:30 +0000 Subject: [PATCH] removed unnecessary CFX_MUL from clutter_actor_get_abs_position --- ChangeLog | 6 ++++++ clutter/clutter-actor.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e74347415..ac9c3f496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-15 Tomas Frydrych + + * clutter/clutter-actor.c: + (clutter_actor_get_abs_position): + Removed unnecessary CFX_MUL(). + 2007-05-15 Tomas Frydrych * clutter/clutter-behaviour-ellipse.h: diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index c5e0653e5..dc257b395 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -1090,7 +1090,7 @@ clutter_actor_get_abs_position (ClutterActor *self, { ClutterActorBox box; ClutterActor *parent; - gint px = 0, py = 0; + gint px = 0, py = 0; g_return_if_fail (CLUTTER_IS_ACTOR (self)); @@ -1111,10 +1111,8 @@ clutter_actor_get_abs_position (ClutterActor *self, if (parent_scale_x != CFX_ONE || parent_scale_y != CFX_ONE) { - fx = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (box.x1), - parent_scale_x); - fy = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (box.y1), - parent_scale_y); + fx = box.x1 * parent_scale_x; + fy = box.y1 * parent_scale_y; box.x1 = CLUTTER_FIXED_INT (fx); box.y1 = CLUTTER_FIXED_INT (fy);