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

Merge pull request #3581 from akallabeth/alignment_fix

Browse Source 
Fixed surface alignment.
This commit is contained in:
Martin Fleisz
2016-11-17 15:41:17 +01:00
committed by GitHub
parent 15716695fa 95a3144b34
commit f8bcd706f6
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/X11/xf_gfx.c
View File

@@ -232,8 +232,11 @@ static UINT xf_CreateSurface(RdpgfxClientContext* context,
if (xfc->scanline_pad > 0)
{
surface->gdi.scanline += (xfc->scanline_pad / 8);
surface->gdi.scanline -= (surface->gdi.scanline % (xfc->scanline_pad / 8));
const UINT32 align = xfc->scanline_pad / 8;
const UINT32 pad = align - (surface->gdi.scanline % align);
if (align != pad)
surface->gdi.scanline += pad;
}
size = surface->gdi.scanline * surface->gdi.height;

16
libfreerdp/gdi/gfx.c
View File

@@ -29,6 +29,18 @@
#define TAG FREERDP_TAG("gdi")
static DWORD gfx_align_scanline(DWORD widthInBytes, DWORD alignment)
{
const UINT32 align = 16;
const UINT32 pad = align - (widthInBytes % alignment);
UINT32 scanline = widthInBytes;
if (align != pad)
scanline += pad;
return scanline;
}
/**
* Function description
*
@@ -698,7 +710,7 @@ static UINT gdi_CreateSurface(RdpgfxClientContext* context,
return ERROR_INTERNAL_ERROR;
}
surface->scanline = (surface->width + (surface->width % 4)) * 4;
surface->scanline = gfx_align_scanline(surface->width * 4, 16);
surface->data = (BYTE*) calloc(1, surface->scanline * surface->height);
if (!surface->data)
@@ -887,7 +899,7 @@ static UINT gdi_SurfaceToCache(RdpgfxClientContext* context,
cacheEntry->width = (UINT32)(rect->right - rect->left);
cacheEntry->height = (UINT32)(rect->bottom - rect->top);
cacheEntry->format = surface->format;
cacheEntry->scanline = (cacheEntry->width + (cacheEntry->width % 4)) * 4;
cacheEntry->scanline = gfx_align_scanline(cacheEntry->width * 4, 16);
cacheEntry->data = (BYTE*) calloc(1, cacheEntry->scanline * cacheEntry->height);
if (!cacheEntry->data)