mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3680 from akallabeth/patblt_fix 

Fixed patblt for mono color. #3678
This commit is contained in:
Bernhard Miklautz 2017-01-09 17:02:49 +01:00 committed by GitHub
parent 4f5aa69efc 08606323d6
commit caebc3d629
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/xf_gdi.c
View File

@ -378,8 +378,8 @@ static BOOL xf_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt)
else else
{ {
Pixmap pattern = xf_mono_bitmap_new(xfc, 8, 8, brush->data); Pixmap pattern = xf_mono_bitmap_new(xfc, 8, 8, brush->data);
XSetBackground(xfc->display, xfc->gc, backColor); XSetBackground(xfc->display, xfc->gc, foreColor);
XSetForeground(xfc->display, xfc->gc, foreColor); XSetForeground(xfc->display, xfc->gc, backColor);
XSetFillStyle(xfc->display, xfc->gc, FillOpaqueStippled); XSetFillStyle(xfc->display, xfc->gc, FillOpaqueStippled);
XSetStipple(xfc->display, xfc->gc, pattern); XSetStipple(xfc->display, xfc->gc, pattern);
XSetTSOrigin(xfc->display, xfc->gc, brush->x, brush->y); XSetTSOrigin(xfc->display, xfc->gc, brush->x, brush->y);

2
libfreerdp/gdi/gdi.c
View File

@ -698,7 +698,7 @@ static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo)
HGDI_PEN hPen; HGDI_PEN hPen;
rdpGdi* gdi = context->gdi; rdpGdi* gdi = context->gdi;
if (!gdi_decode_color(gdi, lineTo->backColor, &color, NULL)) if (!gdi_decode_color(gdi, lineTo->penColor, &color, NULL))
return FALSE; return FALSE;
if (!(hPen = gdi_CreatePen(lineTo->penStyle, lineTo->penWidth, color, if (!(hPen = gdi_CreatePen(lineTo->penStyle, lineTo->penWidth, color,