From 117b00e0f9e7c65f64cae8be0a895b831d6fca8f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 18 Feb 2008 09:56:37 +0000 Subject: [PATCH] 2008-02-18 Emmanuele Bassi * clutter/clutter-actor.c: (clutter_actor_get_box_from_vertices): Avoid a masking warning caused by math.h utter braindamage. --- ChangeLog | 6 ++++ clutter/clutter-actor.c | 66 ++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 498a98091..b20e22905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-18 Emmanuele Bassi + + * clutter/clutter-actor.c: + (clutter_actor_get_box_from_vertices): Avoid a masking warning + caused by math.h utter braindamage. + 2008-02-18 Emmanuele Bassi * clutter/clutter-actor.c: Document the fact that ancestor can diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 32677ffd7..fe4e837e5 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -5594,41 +5594,41 @@ void clutter_actor_get_box_from_vertices (ClutterVertex vtx[4], ClutterActorBox *box) { - ClutterUnit x1, x2, y1, y2; + ClutterUnit x_1, x_2, y_1, y_2; /* 4-way min/max */ - x1 = vtx[0].x; - y1 = vtx[0].y; - if (vtx[1].x < x1) - x1 = vtx[1].x; - if (vtx[2].x < x1) - x1 = vtx[2].x; - if (vtx[3].x < x1) - x1 = vtx[3].x; - if (vtx[1].y < y1) - y1 = vtx[1].y; - if (vtx[2].y < y1) - y1 = vtx[2].y; - if (vtx[3].y < y1) - y1 = vtx[3].y; + x_1 = vtx[0].x; + y_1 = vtx[0].y; + if (vtx[1].x < x_1) + x_1 = vtx[1].x; + if (vtx[2].x < x_1) + x_1 = vtx[2].x; + if (vtx[3].x < x_1) + x_1 = vtx[3].x; + if (vtx[1].y < y_1) + y_1 = vtx[1].y; + if (vtx[2].y < y_1) + y_1 = vtx[2].y; + if (vtx[3].y < y_1) + y_1 = vtx[3].y; - x2 = vtx[0].x; - y2 = vtx[0].y; - if (vtx[1].x > x2) - x2 = vtx[1].x; - if (vtx[2].x > x2) - x2 = vtx[2].x; - if (vtx[3].x > x2) - x2 = vtx[3].x; - if (vtx[1].y > y2) - y2 = vtx[1].y; - if (vtx[2].y > y2) - y2 = vtx[2].y; - if (vtx[3].y > y2) - y2 = vtx[3].y; + x_2 = vtx[0].x; + y_2 = vtx[0].y; + if (vtx[1].x > x_2) + x_2 = vtx[1].x; + if (vtx[2].x > x_2) + x_2 = vtx[2].x; + if (vtx[3].x > x_2) + x_2 = vtx[3].x; + if (vtx[1].y > y_2) + y_2 = vtx[1].y; + if (vtx[2].y > y_2) + y_2 = vtx[2].y; + if (vtx[3].y > y_2) + y_2 = vtx[3].y; - box->x1 = x1; - box->x2 = x2; - box->y1 = y1; - box->y2 = y2; + box->x1 = x_1; + box->x2 = x_2; + box->y1 = y_1; + box->y2 = y_2; }