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

Merge pull request #3608 from mfleisz/msvc10_fixes 

codec: Fix compilation with VS2010
This commit is contained in:
Martin Fleisz 2016-11-22 14:00:08 +01:00 committed by GitHub
parent 06d47530b6 e45c300824
commit 3f39dc435a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/codec/clear.c
View File

@ -141,10 +141,11 @@ static BOOL clear_decompress_subcode_rlex(wStream* s,
for (i = 0; i < paletteCount; i++)
{
BYTE r, g, b;
UINT32 color;
Stream_Read_UINT8(s, b);
Stream_Read_UINT8(s, g);
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);
}
@ -397,7 +398,7 @@ static BOOL clear_decompress_subcodecs_data(CLEAR_CONTEXT* clear, wStream* s,
{
case 0: /* Uncompressed */
{
UINT32 nSrcStep = width * GetBytesPerPixel(PIXEL_FORMAT_BGR24);;
UINT32 nSrcStep = width * GetBytesPerPixel(PIXEL_FORMAT_BGR24);
UINT32 nSrcSize = nSrcStep * height;
if (bitmapDataByteCount != nSrcSize)

4
libfreerdp/codec/nsc.c
View File

@ -47,7 +47,7 @@ static void nsc_decode(NSC_CONTEXT* context)
UINT16 x;
UINT16 y;
UINT16 rw = ROUND_UP_TO(context->width, 8);
BYTE shift = context->ColorLossLevel - 1; /* colorloss recovery + YCoCg shift */;
BYTE shift = context->ColorLossLevel - 1; /* colorloss recovery + YCoCg shift */
BYTE* bmpdata = context->BitmapData;
for (y = 0; y < context->height; y++)
@ -55,7 +55,7 @@ static void nsc_decode(NSC_CONTEXT* context)
const BYTE* yplane;
const BYTE* coplane;
const BYTE* cgplane;
const BYTE* aplane = context->priv->PlaneBuffers[3] + y * context->width; /* A */;
const BYTE* aplane = context->priv->PlaneBuffers[3] + y * context->width; /* A */
if (context->ChromaSubsamplingLevel)
{