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

GUACAMOLE-184: Merge empty surface fix.

Browse Source
This commit is contained in:
James Muehlner 2017-01-25 21:01:20 -08:00
commit 3f2cdb1971
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/surface.c
View File

@ -1718,15 +1718,20 @@ void guac_common_surface_dup(guac_common_surface* surface, guac_user* user,
guac_protocol_send_size(socket, surface->layer, guac_protocol_send_size(socket, surface->layer,
surface->width, surface->height); surface->width, surface->height);
/* Get entire surface */ /* Send contents of layer, if non-empty */
cairo_surface_t* rect = cairo_image_surface_create_for_data( if (surface->width > 0 && surface->height > 0) {
surface->buffer, CAIRO_FORMAT_RGB24,
surface->width, surface->height, surface->stride);
/* Send PNG for rect */ /* Get entire surface */
guac_user_stream_png(user, socket, GUAC_COMP_OVER, surface->layer, cairo_surface_t* rect = cairo_image_surface_create_for_data(
0, 0, rect); surface->buffer, CAIRO_FORMAT_RGB24,
cairo_surface_destroy(rect); surface->width, surface->height, surface->stride);
/* Send PNG for rect */
guac_user_stream_png(user, socket, GUAC_COMP_OVER, surface->layer,
0, 0, rect);
cairo_surface_destroy(rect);
}
complete: complete:
pthread_mutex_unlock(&surface->_lock); pthread_mutex_unlock(&surface->_lock);