From 9a1d6eded2750572e9f5f79e53ec507dd7a06ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 May 2018 18:22:00 +0200 Subject: New upstream version 5.1.1 --- app/wlib/gtklib/gtkdraw-cairo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/wlib/gtklib/gtkdraw-cairo.c') diff --git a/app/wlib/gtklib/gtkdraw-cairo.c b/app/wlib/gtklib/gtkdraw-cairo.c index 4f3b1d2..8672523 100644 --- a/app/wlib/gtklib/gtkdraw-cairo.c +++ b/app/wlib/gtklib/gtkdraw-cairo.c @@ -188,8 +188,12 @@ static cairo_t* gtkDrawCreateCairoContext( } else { - GdkColor* const gcolor = wlibGetColor(color, TRUE); - cairo_set_source_rgb(cairo, gcolor->red / 65535.0, gcolor->green / 65535.0, gcolor->blue / 65535.0); + long rgbcolor = wDrawGetRGB(color); + int r0, g0, b0; + r0 = (int)(rgbcolor>>16)&0xFF; + g0 = (int)(rgbcolor>>8)&0xFF; + b0 = (int)(rgbcolor)&0xFF; + cairo_set_source_rgb(cairo, r0/255.0, g0/255.0, b0/255.0); cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); } -- cgit v1.2.3