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

libfreerdp-gdi: fix gdi_init

Browse Source
This commit is contained in:
Marc-André Moreau 2014-09-17 19:44:59 -04:00
parent 25f1073aa5
commit 02c1bf14ce
4 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/codec/color.h
View File

@ -401,11 +401,8 @@ extern "C" {
/* Supported Internal Buffer Formats */
#define CLRBUF_16BPP 8
#define CLRBUF_24BPP 16
#define CLRBUF_32BPP 32
#define CLRBUF_ABGR 64 /* ABGR order (as opposed to ARGB) */
struct _CLRCONV
{
int alpha;

2
include/freerdp/gdi/gdi.h
View File

@ -284,7 +284,7 @@ struct rdp_gdi
int bytesPerPixel;
rdpCodecs* codecs;
BOOL abgr;
BOOL invert;
HGDI_DC hdc;
UINT32 format;
HCLRCONV clrconv;

31
libfreerdp/gdi/gdi.c
View File

@ -962,7 +962,7 @@ void gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* cmd)
pSrcData = message->tiles[i]->data;
pDstData = gdi->tile->bitmap->data;
if (!gdi->abgr && (gdi->dstBpp == 32))
if (!gdi->invert && (gdi->dstBpp == 32))
{
gdi->tile->bitmap->data = pSrcData;
}
@ -1147,6 +1147,7 @@ void gdi_resize(rdpGdi* gdi, int width, int height)
int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
{
BOOL rgb555;
rdpGdi* gdi;
rdpCache* cache;
@ -1168,11 +1169,12 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
/* default internal buffer format */
gdi->dstBpp = 32;
gdi->bytesPerPixel = 4;
gdi->format = PIXEL_FORMAT_XRGB32;
if (flags & CLRBUF_ABGR)
gdi->abgr = TRUE;
if (flags & CLRCONV_INVERT)
gdi->invert = TRUE;
rgb555 = (flags & CLRCONV_RGB555) ? TRUE : FALSE;
if (gdi->srcBpp > 16)
{
@ -1181,14 +1183,9 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
gdi->dstBpp = 32;
gdi->bytesPerPixel = 4;
}
else if (flags & CLRBUF_24BPP)
{
gdi->dstBpp = 24;
gdi->bytesPerPixel = 3;
}
else if (flags & CLRBUF_16BPP)
{
gdi->dstBpp = 16;
gdi->dstBpp = rgb555 ? 15 : 16;
gdi->bytesPerPixel = 2;
}
}
@ -1196,7 +1193,7 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
{
if (flags & CLRBUF_16BPP)
{
gdi->dstBpp = 16;
gdi->dstBpp = rgb555 ? 15 : 16;
gdi->bytesPerPixel = 2;
}
else if (flags & CLRBUF_32BPP)
@ -1206,12 +1203,10 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
}
}
if (!gdi->abgr)
if (!gdi->invert)
{
if (gdi->bytesPerPixel == 4)
gdi->format = PIXEL_FORMAT_XRGB32;
else if (gdi->bytesPerPixel == 3)
gdi->format = PIXEL_FORMAT_RGB24;
else if ((gdi->bytesPerPixel == 2) && (gdi->dstBpp == 16))
gdi->format = PIXEL_FORMAT_RGB565;
else if ((gdi->bytesPerPixel == 2) && (gdi->dstBpp == 15))
@ -1221,8 +1216,6 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
{
if (gdi->bytesPerPixel == 4)
gdi->format = PIXEL_FORMAT_XBGR32;
else if (gdi->bytesPerPixel == 3)
gdi->format = PIXEL_FORMAT_BGR24;
else if ((gdi->bytesPerPixel == 2) && (gdi->dstBpp == 16))
gdi->format = PIXEL_FORMAT_BGR565;
else if ((gdi->bytesPerPixel == 2) && (gdi->dstBpp == 15))
@ -1238,9 +1231,9 @@ int gdi_init(freerdp* instance, UINT32 flags, BYTE* buffer)
if (!gdi->clrconv)
return -1;
gdi->clrconv->alpha = (flags & CLRCONV_ALPHA) ? 1 : 0;
gdi->clrconv->invert = (flags & CLRCONV_INVERT) ? 1 : 0;
gdi->clrconv->rgb555 = (flags & CLRCONV_RGB555) ? 1 : 0;
gdi->clrconv->alpha = (flags & CLRCONV_ALPHA) ? TRUE : FALSE;
gdi->clrconv->invert = (flags & CLRCONV_INVERT) ? TRUE : FALSE;
gdi->clrconv->rgb555 = (flags & CLRCONV_RGB555) ? TRUE : FALSE;
gdi->clrconv->palette = (rdpPalette*) malloc(sizeof(rdpPalette));
if (!gdi->clrconv->palette)

6
libfreerdp/gdi/gfx.c
View File

@ -549,7 +549,7 @@ int gdi_CreateSurface(RdpgfxClientContext* context, RDPGFX_CREATE_SURFACE_PDU* c
surface->height = (UINT32) createSurface->height;
surface->alpha = (createSurface->pixelFormat == PIXEL_FORMAT_ARGB_8888) ? TRUE : FALSE;
surface->format = (!gdi->abgr) ? PIXEL_FORMAT_XRGB32 : PIXEL_FORMAT_XBGR32;
surface->format = (!gdi->invert) ? PIXEL_FORMAT_XRGB32 : PIXEL_FORMAT_XBGR32;
surface->scanline = (surface->width + (surface->width % 4)) * 4;
surface->data = (BYTE*) calloc(1, surface->scanline * surface->height);
@ -604,7 +604,7 @@ int gdi_SolidFill(RdpgfxClientContext* context, RDPGFX_SOLID_FILL_PDU* solidFill
r = solidFill->fillPixel.R;
a = solidFill->fillPixel.XA;
if (!gdi->abgr)
if (!gdi->invert)
color = ARGB32(a, r, g, b);
else
color = ABGR32(a, r, g, b);
@ -716,7 +716,7 @@ int gdi_SurfaceToCache(RdpgfxClientContext* context, RDPGFX_SURFACE_TO_CACHE_PDU
cacheEntry->height = (UINT32) (rect->bottom - rect->top);
cacheEntry->alpha = surface->alpha;
cacheEntry->format = (!gdi->abgr) ? PIXEL_FORMAT_XRGB32 : PIXEL_FORMAT_XBGR32;
cacheEntry->format = (!gdi->invert) ? PIXEL_FORMAT_XRGB32 : PIXEL_FORMAT_XBGR32;
cacheEntry->scanline = (cacheEntry->width + (cacheEntry->width % 4)) * 4;
cacheEntry->data = (BYTE*) calloc(1, cacheEntry->scanline * cacheEntry->height);