maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-185: Fix copy/transfer rectangle calculation. Clip source to bounds, NOT to clipping rectangle.

Browse Source
This commit is contained in:
Michael Jumper 2016-10-14 15:22:16 -07:00
parent 2de7d017f5
commit a72531b65c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/surface.c
View File

@ -1250,8 +1250,8 @@ void guac_common_surface_copy(guac_common_surface* src, int sx, int sy,
guac_common_rect srect; guac_common_rect srect;
guac_common_rect_init(&srect, sx, sy, w, h); guac_common_rect_init(&srect, sx, sy, w, h);
/* Clip operation source rect */ /* Clip operation source rect to bounds */
__guac_common_clip_rect(src, &srect, &dx, &dy); __guac_common_bound_rect(src, &srect, &dx, &dy);
if (srect.width <= 0 || srect.height <= 0) if (srect.width <= 0 || srect.height <= 0)
goto complete; goto complete;
@ -1291,7 +1291,7 @@ void guac_common_surface_copy(guac_common_surface* src, int sx, int sy,
/* Update backing surface last if drect can intersect srect */ /* Update backing surface last if drect can intersect srect */
if (src == dst) if (src == dst)
__guac_common_surface_transfer(src, &sx, &sy, __guac_common_surface_transfer(src, &srect.x, &srect.y,
GUAC_TRANSFER_BINARY_SRC, dst, &drect); GUAC_TRANSFER_BINARY_SRC, dst, &drect);
complete: complete:
@ -1318,8 +1318,8 @@ void guac_common_surface_transfer(guac_common_surface* src, int sx, int sy, int
guac_common_rect srect; guac_common_rect srect;
guac_common_rect_init(&srect, sx, sy, w, h); guac_common_rect_init(&srect, sx, sy, w, h);
/* Clip operation source rect */ /* Clip operation source rect to bounds */
__guac_common_clip_rect(src, &srect, &dx, &dy); __guac_common_bound_rect(src, &srect, &dx, &dy);
if (srect.width <= 0 || srect.height <= 0) if (srect.width <= 0 || srect.height <= 0)
goto complete; goto complete;