mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3740 from akallabeth/gdi_color_conversion

Browse Source 
Fix for GDI color decoding issues.
This commit is contained in:
Norbert Federa 2017-02-06 15:13:56 +01:00 committed by GitHub
commit 246801ec11
2 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/X11/xf_graphics.c
View File

@ -62,7 +62,29 @@ BOOL xf_decode_color(xfContext* xfc, const UINT32 srcColor, XColor* color)
if (!settings)
return FALSE;
SrcFormat = gdi_get_pixel_format(settings->ColorDepth);
switch (settings->ColorDepth)
{
case 32:
case 24:
SrcFormat = PIXEL_FORMAT_BGR24;
break;
case 16:
SrcFormat = PIXEL_FORMAT_RGB16;
break;
case 15:
SrcFormat = PIXEL_FORMAT_RGB15;
break;
case 8:
SrcFormat = PIXEL_FORMAT_RGB8;
break;
default:
return FALSE;
}
SplitColor(srcColor, SrcFormat, &r, &g, &b, &a, &gdi->palette);
color->blue = (unsigned short)(b << 8);
color->green = (unsigned short)(g << 8);

45
libfreerdp/gdi/gdi.c
View File

@ -322,13 +322,41 @@ static const BYTE GDI_BS_HATCHED_PATTERNS[] =
INLINE BOOL gdi_decode_color(rdpGdi* gdi, const UINT32 srcColor,
UINT32* color, UINT32* format)
{
UINT32 SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth);
UINT32 SrcFormat;
UINT32 ColorDepth;
if (!gdi || !color || !gdi->context || !gdi->context->settings)
return FALSE;
ColorDepth = gdi->context->settings->ColorDepth;
switch (ColorDepth)
{
case 32:
case 24:
SrcFormat = PIXEL_FORMAT_BGR24;
break;
case 16:
SrcFormat = PIXEL_FORMAT_RGB16;
break;
case 15:
SrcFormat = PIXEL_FORMAT_RGB15;
break;
case 8:
SrcFormat = PIXEL_FORMAT_RGB8;
break;
default:
return FALSE;
}
if (format)
*format = SrcFormat;
*format = gdi->dstFormat;
*color = ConvertColor(srcColor, SrcFormat,
gdi->dstFormat, &gdi->palette);
*color = ConvertColor(srcColor, SrcFormat, gdi->dstFormat, &gdi->palette);
return TRUE;
}
@ -340,12 +368,12 @@ INLINE DWORD gdi_rop3_code(BYTE code)
UINT32 gdi_get_pixel_format(UINT32 bitsPerPixel)
{
UINT32 format = PIXEL_FORMAT_XBGR32;
UINT32 format;
switch (bitsPerPixel)
{
case 32:
format = PIXEL_FORMAT_ABGR32;
format = PIXEL_FORMAT_BGRA32;
break;
case 24:
@ -363,6 +391,11 @@ UINT32 gdi_get_pixel_format(UINT32 bitsPerPixel)
case 8:
format = PIXEL_FORMAT_RGB8;
break;
default:
WLog_ERR(TAG, "Unsupported color depth %"PRIu32, bitsPerPixel);
format = 0;
break;
}
return format;