From b9bac6ffbfb2a4e0d286e69500ca09454a3b36b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Mon, 9 Jan 2012 19:47:52 -0500
Subject: [PATCH] libfreerdp-gdi: fix RGB<->BGR color conversion

---
 libfreerdp-gdi/16bpp.c | 2 +-
 libfreerdp-gdi/32bpp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libfreerdp-gdi/16bpp.c b/libfreerdp-gdi/16bpp.c
index 44c121cdb..2c5102a25 100644
--- a/libfreerdp-gdi/16bpp.c
+++ b/libfreerdp-gdi/16bpp.c
@@ -38,7 +38,7 @@ uint16 gdi_get_color_16bpp(HGDI_DC hdc, GDI_COLOR color)
 	uint8 r, g, b;
 	uint16 color16;
 
-	GetRGB32(r, g, b, color);
+	GetBGR32(r, g, b, color);
 
 	if (hdc->rgb555)
 	{
diff --git a/libfreerdp-gdi/32bpp.c b/libfreerdp-gdi/32bpp.c
index 3b8b84d95..3c7285625 100644
--- a/libfreerdp-gdi/32bpp.c
+++ b/libfreerdp-gdi/32bpp.c
@@ -39,7 +39,7 @@ uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color)
 	uint8 a, r, g, b;
 
 	a = 0xFF;
-	GetRGB32(r, g, b, color);
+	GetBGR32(r, g, b, color);
 
 	if (hdc->invert)
 	{
@@ -47,7 +47,7 @@ uint32 gdi_get_color_32bpp(HGDI_DC hdc, GDI_COLOR color)
 	}
 	else
 	{
-		color32 = ARGB32(a, b, g, r);
+		color32 = ARGB32(a, r, g, b);
 	}
 
 	return color32;