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

Merge pull request #16 from glyptodon/fix-clip-rect

Browse Source 
GUAC-996: Do not reset clip upon resize. Fix copy of surface data.
This commit is contained in:
James Muehlner 2015-01-14 16:15:49 -08:00
commit 122de48368
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/guac_surface.c
View File

@ -718,10 +718,10 @@ void guac_common_surface_resize(guac_common_surface* surface, int w, int h) {
surface->height = h; surface->height = h;
surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w); surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
surface->buffer = calloc(h, surface->stride); surface->buffer = calloc(h, surface->stride);
guac_common_surface_reset_clip(surface); __guac_common_bound_rect(surface, &surface->clip_rect, NULL, NULL);
/* Copy relevant old data */ /* Copy relevant old data */
guac_common_rect_constrain(&old_rect, &surface->clip_rect); __guac_common_bound_rect(surface, &old_rect, NULL, NULL);
__guac_common_surface_put(old_buffer, old_stride, &sx, &sy, surface, &old_rect, 1); __guac_common_surface_put(old_buffer, old_stride, &sx, &sy, surface, &old_rect, 1);
/* Free old data */ /* Free old data */