Merge pull request #429 from NiKiZe/master
Fix swaped R<>B fields in colors.
This commit is contained in:
commit
23ce291570
@ -553,7 +553,7 @@ void xf_gdi_polyline(rdpContext* context, POLYLINE_ORDER* polyline)
|
|||||||
xfInfo* xfi = ((xfContext*) context)->xfi;
|
xfInfo* xfi = ((xfContext*) context)->xfi;
|
||||||
|
|
||||||
xf_set_rop2(xfi, polyline->bRop2);
|
xf_set_rop2(xfi, polyline->bRop2);
|
||||||
color = freerdp_color_convert_rgb(polyline->penColor, xfi->srcBpp, 32, xfi->clrconv);
|
color = freerdp_color_convert_var(polyline->penColor, xfi->srcBpp, 32, xfi->clrconv);
|
||||||
|
|
||||||
XSetFillStyle(xfi->display, xfi->gc, FillSolid);
|
XSetFillStyle(xfi->display, xfi->gc, FillSolid);
|
||||||
XSetForeground(xfi->display, xfi->gc, color);
|
XSetForeground(xfi->display, xfi->gc, color);
|
||||||
@ -711,7 +711,7 @@ void xf_gdi_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc)
|
|||||||
xfInfo* xfi = ((xfContext*) context)->xfi;
|
xfInfo* xfi = ((xfContext*) context)->xfi;
|
||||||
|
|
||||||
xf_set_rop2(xfi, polygon_sc->bRop2);
|
xf_set_rop2(xfi, polygon_sc->bRop2);
|
||||||
brush_color = freerdp_color_convert_rgb(polygon_sc->brushColor, xfi->srcBpp, 32, xfi->clrconv);
|
brush_color = freerdp_color_convert_var(polygon_sc->brushColor, xfi->srcBpp, 32, xfi->clrconv);
|
||||||
|
|
||||||
npoints = polygon_sc->numPoints + 1;
|
npoints = polygon_sc->numPoints + 1;
|
||||||
points = xmalloc(sizeof(XPoint) * npoints);
|
points = xmalloc(sizeof(XPoint) * npoints);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user