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

Fixed surface alignment.

Browse Source
This commit is contained in:
Armin Novak 2016-10-27 22:59:16 +02:00 committed by Armin Novak
parent 043243f43c
commit f62d00445e
2 changed files with 15 additions and 4 deletions
Show Stats 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) if (xfc->scanline_pad > 0)
{ {
surface->gdi.scanline += (xfc->scanline_pad / 8); const UINT32 align = xfc->scanline_pad / 8;
surface->gdi.scanline -= (surface->gdi.scanline % (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; size = surface->gdi.scanline * surface->gdi.height;

12
libfreerdp/gdi/gfx.c
View File

@ -698,8 +698,16 @@ static UINT gdi_CreateSurface(RdpgfxClientContext* context,
return ERROR_INTERNAL_ERROR; return ERROR_INTERNAL_ERROR;
} }
surface->scanline = (surface->width + (surface->width % 4)) * 4; surface->scanline = surface->width * 4;
surface->data = (BYTE*) calloc(1, surface->scanline * surface->height); {
const UINT32 align = 16;
const UINT32 pad = align - (surface->scanline % align);
if (align != pad)
surface->scanline += pad;
surface->data = (BYTE*) calloc(1, surface->scanline * surface->height);
}
if (!surface->data) if (!surface->data)
{ {