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

Merge pull request #2180 from nfedera/fix-2014-10-31-01 

codec: fix pointer data conversion + 24bpp support
This commit is contained in:
Marc-André Moreau 2014-10-31 07:49:32 -04:00
parent d58c6de93c ea0d8a280c
commit d323753a9e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/codec/color.c
View File

@ -1508,9 +1508,10 @@ int freerdp_image_copy_from_pointer_data(BYTE* pDstData, UINT32 DstFormat, int n
return 1;
}
else if (xorBpp == 32)
else if (xorBpp == 24 || xorBpp == 32)
{
xorStep = nWidth * 4;
int xorBytesPerPixel = xorBpp >> 3;
xorStep = nWidth * xorBytesPerPixel;
pDstPixel = (UINT32*) &pDstData[(nYDst * nDstStep) + (nXDst * 4)];
for (y = 0; y < nHeight; y++)
@ -1530,19 +1531,21 @@ int freerdp_image_copy_from_pointer_data(BYTE* pDstData, UINT32 DstFormat, int n
for (x = 0; x < nWidth; x++)
{
xorPixel = *((UINT32*) xorBits);
xorBits += 4;
if (xorBpp == 32)
xorPixel = *((UINT32*) xorBits);
else
xorPixel = xorBits[0] | xorBits[1] << 8 | xorBits[2] << 16 | 0xFF << 24;
xorBits += xorBytesPerPixel;
andPixel = (*andBits & andBit) ? 1 : 0;
if (!(andBit >>= 1)) { andBits++; andBit = 0x80; }
xorPixel |= 0xFF000000;
if (andPixel)
{
if ((~xorPixel) & 0xFFFFFF) /* black */
if (xorPixel == 0xFF000000) /* black */
*pDstPixel++ = 0x00000000; /* transparent */
else if (xorPixel & 0xFFFFFF) /* white */
else if (xorPixel == 0xFFFFFFFF) /* white */
*pDstPixel++ = 0xFF000000; /* inverted (set as black) */
else
*pDstPixel++ = xorPixel;