mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-21 06:46:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: add -Wfloat-conversion

Browse source
This commit is contained in:
Kirill Primak 2022-09-19 00:16:24 +03:00
parent 2ad25b1460
commit cf857ecf7b
31 changed files with 220 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

11
util/box.c
View file

@ -50,10 +50,13 @@ bool wlr_box_intersection(struct wlr_box *dest, const struct wlr_box *box_a,
return false;
}
int x1 = fmax(box_a->x, box_b->x);
int y1 = fmax(box_a->y, box_b->y);
int x2 = fmin(box_a->x + box_a->width, box_b->x + box_b->width);
int y2 = fmin(box_a->y + box_a->height, box_b->y + box_b->height);
int x1 = box_a->x > box_b->x ? box_a->x : box_b->x;
int y1 = box_a->y > box_b->y ? box_a->y : box_b->y;
int x2a = box_a->x + box_a->width, x2b = box_b->x + box_b->width;
int y2a = box_a->y + box_a->height, y2b = box_b->y + box_b->height;
int x2 = x2a < x2b ? x2a : x2b;
int y2 = y2a < y2b ? y2a : y2b;
dest->x = x1;
dest->y = y1;