isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 02:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

window-actor: Use actual image size for capture

Browse Source 
Previously, the clipping rectangle passed to
`meta_surface_actor_get_image()` was updated with the actual texture
size, but recent changes in `meta_shaped_texture_get_image()` now keep
the caller's clipping rectangle unchanged.

The implementation of `meta_window_actor_capture_into()` was relying on
the old behavior of updating the passed clipping rectangle, but now that
it's kept unchanged, the actual clipping rectangle used to copy the data
is wrong, which causes either a distorded image or worse, a crash of
mutter.

Use the resulting cairo image size to copy the data instead of the
clipping rectangle to avoid the issue and get the expected size.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/442
This commit is contained in:
Olivier Fourdan 2019-01-22 10:22:27 +01:00 committed by Ray Strode
parent a7f2145965
commit 3bdfbf97b9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compositor/meta-window-actor.c
View File

@ -2260,36 +2260,38 @@ meta_window_actor_capture_into (MetaScreenCastWindow *screen_cast_window,
{ {
MetaWindowActor *window_actor = META_WINDOW_ACTOR (screen_cast_window); MetaWindowActor *window_actor = META_WINDOW_ACTOR (screen_cast_window);
cairo_surface_t *image; cairo_surface_t *image;
MetaRectangle clip_rect;
uint8_t *cr_data; uint8_t *cr_data;
int cr_stride; int cr_stride;
int cr_width;
int cr_height;
int bpp = 4; int bpp = 4;
if (meta_window_actor_is_destroyed (window_actor)) if (meta_window_actor_is_destroyed (window_actor))
return; return;
clip_rect = *bounds; image = meta_surface_actor_get_image (window_actor->priv->surface, bounds);
image = meta_surface_actor_get_image (window_actor->priv->surface, &clip_rect);
cr_data = cairo_image_surface_get_data (image); cr_data = cairo_image_surface_get_data (image);
cr_width = cairo_image_surface_get_width (image);
cr_height = cairo_image_surface_get_height (image);
cr_stride = cairo_image_surface_get_stride (image); cr_stride = cairo_image_surface_get_stride (image);
if (clip_rect.width < bounds->width || clip_rect.height < bounds->height) if (cr_width < bounds->width || cr_height < bounds->height)
{ {
uint8_t *src, *dst; uint8_t *src, *dst;
src = cr_data; src = cr_data;
dst = data; dst = data;
for (int i = 0; i < clip_rect.height; i++) for (int i = 0; i < cr_height; i++)
{ {
memcpy (dst, src, cr_stride); memcpy (dst, src, cr_stride);
if (clip_rect.width < bounds->width) if (cr_width < bounds->width)
memset (dst + cr_stride, 0, (bounds->width * bpp) - cr_stride); memset (dst + cr_stride, 0, (bounds->width * bpp) - cr_stride);
src += cr_stride; src += cr_stride;
dst += bounds->width * bpp; dst += bounds->width * bpp;
} }
for (int i = clip_rect.height; i < bounds->height; i++) for (int i = cr_height; i < bounds->height; i++)
{ {
memset (dst, 0, bounds->width * bpp); memset (dst, 0, bounds->width * bpp);
dst += bounds->width * bpp; dst += bounds->width * bpp;
@ -2297,7 +2299,7 @@ meta_window_actor_capture_into (MetaScreenCastWindow *screen_cast_window,
} }
else else
{ {
memcpy (data, cr_data, clip_rect.height * cr_stride); memcpy (data, cr_data, cr_height * cr_stride);
} }
cairo_surface_destroy (image); cairo_surface_destroy (image);