From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 14 Nov 2016 08:36:16 +0000 (+0100)
Subject: Fixed line drawing color format #3592
X-Git-Tag: 2.0.0-beta1+android10~128^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1203315b500e6c96b1cacdd033291963a3b8e9f6;p=platform%2Fupstream%2Ffreerdp.git

Fixed line drawing color format #3592
---

diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c
index 9892912..8e8ef81 100644
--- a/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@ -696,14 +696,13 @@ static BOOL gdi_line_to(rdpContext* context, const LINE_TO_ORDER* lineTo)
 {
 	UINT32 color;
 	HGDI_PEN hPen;
-	UINT32 SrcFormat;
 	rdpGdi* gdi = context->gdi;
 
-	if (!gdi_decode_color(gdi, lineTo->backColor, &color, &SrcFormat))
+	if (!gdi_decode_color(gdi, lineTo->backColor, &color, NULL))
 		return FALSE;
 
 	if (!(hPen = gdi_CreatePen(lineTo->penStyle, lineTo->penWidth, color,
-	                           SrcFormat, &gdi->palette)))
+	                           gdi->drawing->hdc->format, &gdi->palette)))
 		return FALSE;
 
 	gdi_SelectObject(gdi->drawing->hdc, (HGDIOBJECT) hPen);
@@ -722,13 +721,13 @@ static BOOL gdi_polyline(rdpContext* context, const POLYLINE_ORDER* polyline)
 	UINT32 color;
 	HGDI_PEN hPen;
 	DELTA_POINT* points;
-	UINT32 SrcFormat;
 	rdpGdi* gdi = context->gdi;
 
-	if (!gdi_decode_color(gdi, polyline->penColor, &color, &SrcFormat))
+	if (!gdi_decode_color(gdi, polyline->penColor, &color, NULL))
 		return FALSE;
 
-	if (!(hPen = gdi_CreatePen(GDI_PS_SOLID, 1, color, SrcFormat, &gdi->palette)))
+	if (!(hPen = gdi_CreatePen(GDI_PS_SOLID, 1, color, gdi->drawing->hdc->format,
+	                           &gdi->palette)))
 		return FALSE;
 
 	gdi_SelectObject(gdi->drawing->hdc, (HGDIOBJECT) hPen);