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

GUAC-236: Ensure rectangle is explicitly set when painting buffers.

Browse Source
This commit is contained in:
Michael Jumper 2016-02-28 00:52:57 -08:00
parent bd84315824
commit 83beccf7e4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/guacenc/buffer.c
View File

@ -96,8 +96,8 @@ int guacenc_buffer_resize(guacenc_buffer* buffer, int width, int height) {
/* Copy old surface, if defined */ /* Copy old surface, if defined */
if (buffer->surface != NULL) { if (buffer->surface != NULL) {
cairo_set_source_surface(cairo, buffer->surface, 0, 0); cairo_set_source_surface(cairo, buffer->surface, 0, 0);
cairo_rectangle(cairo, 0, 0, width, height);
cairo_paint(cairo); cairo_paint(cairo);
cairo_set_source_rgba(cairo, 0.0, 0.0, 0.0, 1.0);
} }
/* Update properties */ /* Update properties */

8
src/guacenc/image-stream.c
View File

@ -134,8 +134,16 @@ int guacenc_image_stream_end(guacenc_image_stream* stream,
/* Draw surface to buffer */ /* Draw surface to buffer */
if (buffer->cairo != NULL) { if (buffer->cairo != NULL) {
/* Get surface dimensions */
int width = cairo_image_surface_get_width(surface);
int height = cairo_image_surface_get_height(surface);
/* Paint surface contents to buffer */
cairo_set_source_surface(buffer->cairo, surface, stream->x, stream->y); cairo_set_source_surface(buffer->cairo, surface, stream->x, stream->y);
cairo_rectangle(buffer->cairo, stream->x, stream->y, width, height);
cairo_fill(buffer->cairo); cairo_fill(buffer->cairo);
} }
cairo_surface_destroy(surface); cairo_surface_destroy(surface);