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

Merge pull request #3870 from akallabeth/mouse_cursor_23bpp

Browse Source 
Ignore AND mask for 32bpp cursor. #3863
This commit is contained in:
Bernhard Miklautz 2017-03-20 10:09:23 +01:00 committed by GitHub
commit 96b486b8f9
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libfreerdp/codec/color.c
View File

@ -303,17 +303,11 @@ BOOL freerdp_image_copy_from_pointer_data(
{
UINT32 pixelFormat;
UINT32 color;
BOOL ignoreAndMask = FALSE;
if (xorBpp == 32)
{
pixelFormat = PIXEL_FORMAT_BGRA32;
xorPixel = ReadColor(xorBits, pixelFormat);
if (xorPixel & 0xFF)
ignoreAndMask = TRUE;
else
xorPixel |= 0xFF;
}
else if (xorBpp == 16)
{
@ -349,8 +343,7 @@ BOOL freerdp_image_copy_from_pointer_data(
}
}
/* Ignore the AND mask, if the color format already supplies alpha data. */
if (andPixel && !ignoreAndMask)
if (andPixel)
{
if (xorPixel == 0xFF000000) /* black -> transparent */
xorPixel = 0x00000000;