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

Fixed clear codec glyph cache.

Browse Source
This commit is contained in:
Armin Novak
2016-12-07 12:49:04 +01:00
parent 514a33d435
commit 319c767f7c
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/codec/clear.h
View File

@@ -39,7 +39,7 @@ struct _CLEAR_GLYPH_ENTRY
{
UINT32 size;
UINT32 count;
UINT32* pixels;
BYTE* pixels;
};
typedef struct _CLEAR_GLYPH_ENTRY CLEAR_GLYPH_ENTRY;

40
libfreerdp/codec/clear.c
View File

@@ -124,7 +124,6 @@ static BOOL clear_decompress_subcode_rlex(wStream* s,
{
UINT32 x = 0, y = 0;
UINT32 i;
UINT32 SrcFormat = PIXEL_FORMAT_BGR24;
UINT32 pixelCount;
UINT32 nSrcStep;
UINT32 bitmapDataOffset;
@@ -156,12 +155,10 @@ 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);
color = GetColor(SrcFormat, r, g, b, 0xFF);
palette[i] = ConvertColor(color, SrcFormat, DstFormat, NULL);
palette[i] = GetColor(DstFormat, r, g, b, 0xFF);
}
pixelIndex = 0;
@@ -887,10 +884,13 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* clear,
BYTE* pDstData, UINT32 DstFormat, UINT32 nDstStep,
UINT32 nXDst, UINT32 nYDst,
UINT32 nDstWidth, UINT32 nDstHeight,
const gdiPalette* palette)
const gdiPalette* palette, BYTE** ppGlyphData)
{
UINT16 glyphIndex = 0;
if (ppGlyphData)
*ppGlyphData = NULL;
if ((glyphFlags & CLEARCODEC_FLAG_GLYPH_HIT) &&
!(glyphFlags & CLEARCODEC_FLAG_GLYPH_INDEX))
{
@@ -958,20 +958,19 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* clear,
if (glyphFlags & CLEARCODEC_FLAG_GLYPH_INDEX)
{
BYTE* glyphData;
UINT32 nSrcStep;
const UINT32 bpp = GetBytesPerPixel(clear->format);
CLEAR_GLYPH_ENTRY* glyphEntry = &(clear->GlyphCache[glyphIndex]);
glyphEntry->count = nWidth * nHeight;
if (glyphEntry->count > glyphEntry->size)
{
UINT32* tmp;
BYTE* tmp;
glyphEntry->size = glyphEntry->count;
tmp = (UINT32*) realloc(glyphEntry->pixels, glyphEntry->size * 4);
tmp = realloc(glyphEntry->pixels, glyphEntry->size * bpp);
if (!tmp)
{
WLog_ERR(TAG, "glyphEntry->pixels realloc %lu failed!", glyphEntry->size * 4);
WLog_ERR(TAG, "glyphEntry->pixels realloc %lu failed!", glyphEntry->size * bpp);
return FALSE;
}
@@ -984,14 +983,10 @@ static BOOL clear_decompress_glyph_data(CLEAR_CONTEXT* clear,
return FALSE;
}
glyphData = (BYTE*) glyphEntry->pixels;
nSrcStep = nWidth * GetBytesPerPixel(clear->format);
if (ppGlyphData)
*ppGlyphData = glyphEntry->pixels;
if (!convert_color(pDstData, nDstStep, DstFormat,
nXDst, nYDst, nWidth, nHeight,
glyphData, nSrcStep, clear->format,
nDstWidth, nDstHeight, palette))
return FALSE;
return TRUE;
}
return TRUE;
@@ -1010,6 +1005,7 @@ INT32 clear_decompress(CLEAR_CONTEXT* clear, const BYTE* pSrcData,
UINT32 bandsByteCount;
UINT32 subcodecByteCount;
wStream* s;
BYTE* glyphData = NULL;
if (!pDstData)
return -1002;
@@ -1058,7 +1054,7 @@ INT32 clear_decompress(CLEAR_CONTEXT* clear, const BYTE* pSrcData,
if (!clear_decompress_glyph_data(clear, s, glyphFlags, nWidth,
nHeight, pDstData, DstFormat,
nDstStep, nXDst, nYDst,
nDstWidth, nDstHeight, palette))
nDstWidth, nDstHeight, palette, &glyphData))
{
WLog_ERR(TAG, "clear_decompress_glyph_data failed!");
goto fail;
@@ -1113,6 +1109,14 @@ INT32 clear_decompress(CLEAR_CONTEXT* clear, const BYTE* pSrcData,
}
}
if (glyphData)
{
if (!freerdp_image_copy(glyphData, clear->format, 0, 0, 0, nWidth, nHeight,
pDstData, DstFormat, nDstStep, nXDst, nYDst, palette,
FREERDP_FLIP_NONE))
goto fail;
}
finish:
rc = 0;
fail: