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

screen-share: use read_format consistently

Browse Source 
This was using read_format for the read_pixels() call, and then using a
hardcoded format for interpreting the data received from read_pixels().
That works only by accident, read_format being the same as the hardcoded
format.

Use read_format for the interpreting too. This should guarantee the read
pixels are processed correctly.

Found by code inspection.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2022-08-01 13:01:38 +03:00
committed by Marius Vlad
parent d2aa62a074
commit 03c229f4ce
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/screen-share.c
+5 -3
View File
@@ -828,6 +828,8 @@ shared_output_repainted(struct wl_listener *listener, void *data)
pixman_box32_t *r; pixman_box32_t *r;
pixman_image_t *damaged_image; pixman_image_t *damaged_image;
pixman_transform_t transform; pixman_transform_t transform;
const pixman_format_code_t pixman_format =
so->output->compositor->read_format;
width = so->output->current_mode->width; width = so->output->current_mode->width;
height = so->output->current_mode->height; height = so->output->current_mode->height;
@@ -882,13 +884,13 @@ shared_output_repainted(struct wl_listener *listener, void *data)
y_orig = y; y_orig = y;
so->output->compositor->renderer->read_pixels( so->output->compositor->renderer->read_pixels(
so->output, so->output->compositor->read_format, so->output, pixman_format,
so->tmp_data, x, y_orig, width, height); so->tmp_data, x, y_orig, width, height);
damaged_image = pixman_image_create_bits(PIXMAN_a8r8g8b8, damaged_image = pixman_image_create_bits(pixman_format,
width, height, width, height,
so->tmp_data, so->tmp_data,
(PIXMAN_FORMAT_BPP(PIXMAN_a8r8g8b8) / 8) * width); (PIXMAN_FORMAT_BPP(pixman_format) / 8) * width);
if (!damaged_image) if (!damaged_image)
goto err_pixman_init; goto err_pixman_init;