mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-layout: fix rectangle calculation by calc_inverse_matrix_transform()

Browse Source 
It's ok if the rectangle is too large: If the calculation fails, the
bounding rectangle is used anyways. However, a rectangle that is too small
will create incorrect results. So make sure to round all edges outwards.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
This commit is contained in:
Michael Olbrich 2018-10-01 15:12:11 +02:00 committed by Marius Vlad
parent 723709aa07
commit bdc39b5909
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ivi-shell/ivi-layout.c
View File

@ -436,19 +436,19 @@ calc_inverse_matrix_transform(const struct weston_matrix *matrix,
weston_matrix_transform(&m, &bottom_right); weston_matrix_transform(&m, &bottom_right);
if (top_left.f[0] < bottom_right.f[0]) { if (top_left.f[0] < bottom_right.f[0]) {
rect_output->x = top_left.f[0]; rect_output->x = floorf(top_left.f[0]);
rect_output->width = bottom_right.f[0] - rect_output->x; rect_output->width = ceilf(bottom_right.f[0] - rect_output->x);
} else { } else {
rect_output->x = bottom_right.f[0]; rect_output->x = floorf(bottom_right.f[0]);
rect_output->width = top_left.f[0] - rect_output->x; rect_output->width = ceilf(top_left.f[0] - rect_output->x);
} }
if (top_left.f[1] < bottom_right.f[1]) { if (top_left.f[1] < bottom_right.f[1]) {
rect_output->y = top_left.f[1]; rect_output->y = floorf(top_left.f[1]);
rect_output->height = bottom_right.f[1] - rect_output->y; rect_output->height = ceilf(bottom_right.f[1] - rect_output->y);
} else { } else {
rect_output->y = bottom_right.f[1]; rect_output->y = floorf(bottom_right.f[1]);
rect_output->height = top_left.f[1] - rect_output->y; rect_output->height = ceilf(top_left.f[1] - rect_output->y);
} }
ivi_rectangle_intersect(rect_output, boundingbox, rect_output); ivi_rectangle_intersect(rect_output, boundingbox, rect_output);