From 0f593bb47fd1e65b316d07ce5f7161d732690831 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 23 Feb 2012 10:01:41 -0800 Subject: [PATCH] freerdp_color_convert is now freerdp_color_convert_var as of FreeRDP 1.0.1 release. --- protocols/rdp/src/rdp_gdi.c | 2 +- protocols/rdp/src/rdp_glyph.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/protocols/rdp/src/rdp_gdi.c b/protocols/rdp/src/rdp_gdi.c index 4159d77e..52f19669 100644 --- a/protocols/rdp/src/rdp_gdi.c +++ b/protocols/rdp/src/rdp_gdi.c @@ -109,7 +109,7 @@ void guac_rdp_gdi_memblt(rdpContext* context, MEMBLT_ORDER* memblt) { void guac_rdp_gdi_opaquerect(rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect) { guac_client* client = ((rdp_freerdp_context*) context)->client; - uint32 color = freerdp_color_convert(opaque_rect->color, + uint32 color = freerdp_color_convert_var(opaque_rect->color, context->instance->settings->color_depth, 32, ((rdp_freerdp_context*) context)->clrconv); diff --git a/protocols/rdp/src/rdp_glyph.c b/protocols/rdp/src/rdp_glyph.c index 608b722f..c6fbce0d 100644 --- a/protocols/rdp/src/rdp_glyph.c +++ b/protocols/rdp/src/rdp_glyph.c @@ -142,11 +142,11 @@ void guac_rdp_glyph_begindraw(rdpContext* context, guac_client* client = ((rdp_freerdp_context*) context)->client; rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data; - bgcolor = freerdp_color_convert(bgcolor, + bgcolor = freerdp_color_convert_var(bgcolor, context->instance->settings->color_depth, 32, ((rdp_freerdp_context*) context)->clrconv); - fgcolor = freerdp_color_convert(fgcolor, + fgcolor = freerdp_color_convert_var(fgcolor, context->instance->settings->color_depth, 32, ((rdp_freerdp_context*) context)->clrconv);