From 25d9773e150bd7e90018334702371e9a47fa046f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 18 Nov 2008 13:52:22 +0000 Subject: [PATCH] 2008-11-18 Emmanuele Bassi * clutter/clutter-texture.c: (clutter_texture_get_preferred_width): Fix the usage of the fixed point division macro. --- ChangeLog | 6 ++++++ clutter/clutter-texture.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 75936be..295c607 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-11-18 Emmanuele Bassi + * clutter/clutter-texture.c: + (clutter_texture_get_preferred_width): Fix the usage of the + fixed point division macro. + +2008-11-18 Emmanuele Bassi + * tests/conform/test-conform-main.c (main): Do not run the conformance test suite if we are on X11 but we do not have a DISPLAY available. Some of the tests require a DISPLAY, diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 0d79065..17be068 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -332,7 +332,7 @@ clutter_texture_get_preferred_width (ClutterActor *self, /* Set the natural width so as to preserve the aspect ratio */ ClutterFixed ratio, height; - ratio = COGL_FIXED_MUL (COGL_FIXED_FROM_INT (priv->width), + ratio = COGL_FIXED_DIV (COGL_FIXED_FROM_INT (priv->width), COGL_FIXED_FROM_INT (priv->height)); height = CLUTTER_UNITS_TO_FIXED (for_height); -- 2.7.4