brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[texture] Fix ClutterFixed usage

Browse Source 
Do not use ClutterFixed and its macros inside the Texture.
This commit is contained in:
Emmanuele Bassi 2009-03-09 17:31:44 +00:00
parent 52811b240f
commit 97d0a4845a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-texture.c
View File

@ -352,15 +352,14 @@ clutter_texture_get_preferred_width (ClutterActor *self,
else else
{ {
/* Set the natural width so as to preserve the aspect ratio */ /* Set the natural width so as to preserve the aspect ratio */
ClutterFixed ratio, height; gfloat ratio, height;
ratio = CLUTTER_FIXED_DIV ((float)(priv->width), ratio = (float)(priv->width) / (float)(priv->height);
(float)(priv->height));
height = CLUTTER_UNITS_TO_FIXED (for_height); height = CLUTTER_UNITS_TO_FLOAT (for_height);
*natural_width_p = *natural_width_p =
CLUTTER_UNITS_FROM_FIXED (CLUTTER_FIXED_MUL (ratio, height)); CLUTTER_UNITS_FROM_FLOAT (ratio * height);
} }
} }
} }
@ -397,15 +396,14 @@ clutter_texture_get_preferred_height (ClutterActor *self,
else else
{ {
/* Set the natural height so as to preserve the aspect ratio */ /* Set the natural height so as to preserve the aspect ratio */
ClutterFixed ratio, width; gfloat ratio, width;
ratio = CLUTTER_FIXED_DIV ((float)(priv->height), ratio = (float)(priv->height) / (float)(priv->width);
(float)(priv->width));
width = CLUTTER_UNITS_TO_FIXED (for_width); width = CLUTTER_UNITS_TO_FLOAT (for_width);
*natural_height_p = *natural_height_p =
CLUTTER_UNITS_FROM_FIXED (CLUTTER_FIXED_MUL (ratio, width)); CLUTTER_UNITS_FROM_FLOAT (ratio * width);
} }
} }
} }