You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/01/27 22:18:03 UTC
[1/2] guacamole-server git commit: GUACAMOLE-490: Take channel mask
into account when rendering image streams to buffers.
Repository: guacamole-server
Updated Branches:
refs/heads/master db85163e2 -> 57428a95a
GUACAMOLE-490: Take channel mask into account when rendering image streams to buffers.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/dcaf7b2c
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/dcaf7b2c
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/dcaf7b2c
Branch: refs/heads/master
Commit: dcaf7b2c21337cd8cd27d61ca6925711f6493684
Parents: db85163
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Nov 27 19:20:51 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Jan 26 16:08:51 2018 -0800
----------------------------------------------------------------------
src/guacenc/image-stream.c | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/dcaf7b2c/src/guacenc/image-stream.c
----------------------------------------------------------------------
diff --git a/src/guacenc/image-stream.c b/src/guacenc/image-stream.c
index 29a7990..8789dc1 100644
--- a/src/guacenc/image-stream.c
+++ b/src/guacenc/image-stream.c
@@ -18,6 +18,7 @@
*/
#include "config.h"
+#include "display.h"
#include "image-stream.h"
#include "jpeg.h"
#include "log.h"
@@ -139,6 +140,7 @@ int guacenc_image_stream_end(guacenc_image_stream* stream,
/* Draw surface to buffer */
if (buffer->cairo != NULL) {
+ cairo_set_operator(buffer->cairo, guacenc_display_cairo_operator(stream->mask));
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);
[2/2] guacamole-server git commit: GUACAMOLE-490: Merge take channel
mask into account when rendering image streams to buffers.
Posted by vn...@apache.org.
GUACAMOLE-490: Merge take channel mask into account when rendering image streams to buffers.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/57428a95
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/57428a95
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/57428a95
Branch: refs/heads/master
Commit: 57428a95aad27e0168887f70194aa82bea21852e
Parents: db85163 dcaf7b2
Author: Nick Couchman <vn...@apache.org>
Authored: Sat Jan 27 17:17:24 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Sat Jan 27 17:17:24 2018 -0500
----------------------------------------------------------------------
src/guacenc/image-stream.c | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------