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

2008-02-18 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-actor.c:
	(clutter_actor_get_box_from_vertices): Avoid a masking warning
	caused by math.h utter braindamage.
This commit is contained in:
Emmanuele Bassi 2008-02-18 09:56:37 +00:00
parent cbbab92b78
commit 117b00e0f9
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-02-18 Emmanuele Bassi <ebassi@openedhand.com>
* 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 <ebassi@openedhand.com>
* clutter/clutter-actor.c: Document the fact that ancestor can

66
clutter/clutter-actor.c
View File

@ -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;
}