[clutter] Fix interpolation between ClutterRect instances



commit 2f5aee9cb5ef1d258e71a72630e3368026f10a49
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Dec 23 15:36:30 2012 +0000

    Fix interpolation between ClutterRect instances
    
    A stupid typo broke the linear interpolation function.

 clutter/clutter-base-types.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/clutter/clutter-base-types.c b/clutter/clutter-base-types.c
index 62b55d7..f5af8f1 100644
--- a/clutter/clutter-base-types.c
+++ b/clutter/clutter-base-types.c
@@ -1259,7 +1259,7 @@ clutter_rect_progress (const GValue *a,
   const ClutterRect *rect_b = g_value_get_boxed (b);
   ClutterRect res = CLUTTER_RECT_INIT_ZERO;
 
-#define INTERPOLATE(r_a,r_b,member,field,factor)     ((r_a)->member.field + (((r_b)->member.field - ((r_b)->member.field)) * (factor)))
+#define INTERPOLATE(r_a,r_b,member,field,factor)     ((r_a)->member.field + (((r_b)->member.field - ((r_a)->member.field)) * (factor)))
 
   res.origin.x = INTERPOLATE (rect_a, rect_b, origin, x, progress);
   res.origin.y = INTERPOLATE (rect_a, rect_b, origin, y, progress);
@@ -1269,8 +1269,6 @@ clutter_rect_progress (const GValue *a,
 
 #undef INTERPOLATE
 
-  clutter_rect_normalize_internal (&res);
-
   g_value_set_boxed (retval, &res);
 
   return TRUE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]