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

5
src/common/surface.c
View File

@ -1718,6 +1718,9 @@ 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);
/* Send contents of layer, if non-empty */
if (surface->width > 0 && surface->height > 0) {
/* Get entire surface */ /* Get entire surface */
cairo_surface_t* rect = cairo_image_surface_create_for_data( cairo_surface_t* rect = cairo_image_surface_create_for_data(
surface->buffer, CAIRO_FORMAT_RGB24, surface->buffer, CAIRO_FORMAT_RGB24,
@ -1728,6 +1731,8 @@ void guac_common_surface_dup(guac_common_surface* surface, guac_user* user,
0, 0, rect); 0, 0, rect);
cairo_surface_destroy(rect); cairo_surface_destroy(rect);
}
complete: complete:
pthread_mutex_unlock(&surface->_lock); pthread_mutex_unlock(&surface->_lock);