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

Merge pull request #1917 from SBoyNumber1/BitmapCacheV3OnAndroid

Browse Source 
Added detect of uncompressed data in CACHE_BITMAP_REV3_ORDER. According ...
This commit is contained in:
Marc-André Moreau 2014-07-11 16:35:11 -04:00
commit 4d3ea77972
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libfreerdp/cache/bitmap.c vendored
View File

@ -136,6 +136,7 @@ void update_gdi_cache_bitmap_v3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cach
{ {
rdpBitmap* bitmap; rdpBitmap* bitmap;
rdpBitmap* prevBitmap; rdpBitmap* prevBitmap;
BOOL isCompressed = TRUE;
rdpCache* cache = context->cache; rdpCache* cache = context->cache;
BITMAP_DATA_EX* bitmapData = &cacheBitmapV3->bitmapData; BITMAP_DATA_EX* bitmapData = &cacheBitmapV3->bitmapData;
@ -149,9 +150,13 @@ void update_gdi_cache_bitmap_v3(rdpContext* context, CACHE_BITMAP_V3_ORDER* cach
cacheBitmapV3->bitmapData.bpp = context->instance->settings->ColorDepth; cacheBitmapV3->bitmapData.bpp = context->instance->settings->ColorDepth;
} }
/* According to http://msdn.microsoft.com/en-us/library/gg441209.aspx
* CACHE_BITMAP_REV3_ORDER::bitmapData::codecID = 0x00 (uncompressed) */
isCompressed = (bitmapData->codecID != RDP_CODEC_ID_NONE);
bitmap->Decompress(context, bitmap, bitmap->Decompress(context, bitmap,
bitmapData->data, bitmap->width, bitmap->height, bitmapData->data, bitmap->width, bitmap->height,
bitmapData->bpp, bitmapData->length, TRUE, bitmapData->bpp, bitmapData->length, isCompressed,
bitmapData->codecID); bitmapData->codecID);
bitmap->New(context, bitmap); bitmap->New(context, bitmap);