morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Removed duplicated format variable.

Browse Source
This commit is contained in:
Armin Novak
2017-01-10 10:23:49 +01:00
parent 8fd926f085
commit c444ccbe6e
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/freerdp/codec/nsc.h
View File

@@ -67,7 +67,6 @@ struct _NSC_CONTEXT
UINT16 height;
BYTE* BitmapData;
UINT32 BitmapDataLength;
UINT32 pixel_format;
BYTE* Planes;
UINT32 PlaneByteCount[4];

3
libfreerdp/codec/clear.c
View File

@@ -932,7 +932,8 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* clear,
if ((nWidth * nHeight) > glyphEntry->count)
{
WLog_ERR(TAG, "(nWidth %"PRIu32" * nHeight %"PRIu32") > glyphEntry->count %"PRIu32"", nWidth, nHeight,
WLog_ERR(TAG, "(nWidth %"PRIu32" * nHeight %"PRIu32") > glyphEntry->count %"PRIu32"", nWidth,
nHeight,
glyphEntry->count);
return FALSE;
}

4
libfreerdp/codec/nsc.c
View File

@@ -337,7 +337,9 @@ void nsc_context_free(NSC_CONTEXT* context)
BOOL nsc_context_set_pixel_format(NSC_CONTEXT* context, UINT32 pixel_format)
{
context->pixel_format = pixel_format;
if (!context)
return FALSE;
context->format = pixel_format;
return TRUE;
}

2
libfreerdp/codec/nsc_encode.c
View File

@@ -124,7 +124,7 @@ static void nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data,
for (x = 0; x < context->width; x++)
{
switch (context->pixel_format)
switch (context->format)
{
case PIXEL_FORMAT_BGRX32:
b_val = *src++;

2
libfreerdp/codec/nsc_sse2.c
View File

@@ -74,7 +74,7 @@ static void nsc_encode_argb_to_aycocg_sse2(NSC_CONTEXT* context,
for (x = 0; x < context->width; x += 8)
{
switch (context->pixel_format)
switch (context->format)
{
case PIXEL_FORMAT_BGRX32:
b_val = _mm_set_epi16(*(src + 28), *(src + 24), *(src + 20), *(src + 16),