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

Merge pull request #3638 from mfleisz/comp_fixes

Browse Source 
codec: Fix compiler errors
This commit is contained in:
Bernhard Miklautz 2016-12-02 11:30:55 +01:00 committed by GitHub
commit aab9073f10
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/codec/clear.c
View File

@ -156,10 +156,11 @@ static BOOL clear_decompress_subcode_rlex(wStream* s,
for (i = 0; i < paletteCount; i++) for (i = 0; i < paletteCount; i++)
{ {
BYTE r, g, b; BYTE r, g, b;
UINT32 color;
Stream_Read_UINT8(s, b); Stream_Read_UINT8(s, b);
Stream_Read_UINT8(s, g); Stream_Read_UINT8(s, g);
Stream_Read_UINT8(s, r); Stream_Read_UINT8(s, r);
UINT32 color = GetColor(SrcFormat, r, g, b, 0xFF); color = GetColor(SrcFormat, r, g, b, 0xFF);
palette[i] = ConvertColor(color, SrcFormat, DstFormat, NULL); palette[i] = ConvertColor(color, SrcFormat, DstFormat, NULL);
} }
@ -494,7 +495,7 @@ static BOOL clear_decompress_subcodecs_data(CLEAR_CONTEXT* clear, wStream* s,
{ {
case 0: /* Uncompressed */ case 0: /* Uncompressed */
{ {
UINT32 nSrcStep = width * GetBytesPerPixel(PIXEL_FORMAT_BGR24);; UINT32 nSrcStep = width * GetBytesPerPixel(PIXEL_FORMAT_BGR24);
UINT32 nSrcSize = nSrcStep * height; UINT32 nSrcSize = nSrcStep * height;
if (bitmapDataByteCount != nSrcSize) if (bitmapDataByteCount != nSrcSize)