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

Merge pull request #181 from ngraziano/color-fix

Browse Source 
Color fix
This commit is contained in:
Marc-André Moreau 2011-10-24 19:43:07 -07:00
commit aca6532971
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/xf_graphics.c
View File

@ -43,7 +43,7 @@ void xf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap)
if (bitmap->data != NULL)
{
data = freerdp_image_convert(bitmap->data, NULL,
bitmap->width, bitmap->height, bitmap->bpp, xfi->bpp, xfi->clrconv);
bitmap->width, bitmap->height, xfi->srcBpp, xfi->bpp, xfi->clrconv);
if (bitmap->ephemeral != True)
{
@ -106,7 +106,7 @@ void xf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
{
uint16 size;
size = width * height * (bpp / 8);
size = width * height * (bpp + 7) / 8;
if (bitmap->data == NULL)
bitmap->data = (uint8*) xmalloc(size);

10
libfreerdp-codec/color.c
View File

@ -97,7 +97,7 @@ uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO
case 32:
if (clrconv->alpha)
{
GetABGR32(alpha, red, green, blue, srcColor);
GetARGB32(alpha, red, green, blue, srcColor);
}
else
{
@ -108,10 +108,10 @@ uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO
GetBGR24(red, green, blue, srcColor);
break;
case 16:
GetRGB16(red, green, blue, srcColor);
GetBGR16(red, green, blue, srcColor);
break;
case 15:
GetRGB15(red, green, blue, srcColor);
GetBGR15(red, green, blue, srcColor);
break;
case 8:
srcColor &= 0xFF;
@ -133,7 +133,7 @@ uint32 freerdp_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCO
switch (dstBpp)
{
case 32:
dstColor = ARGB32(alpha, red, green, blue);
dstColor = ABGR32(alpha, red, green, blue);
break;
case 24:
dstColor = BGR24(red, green, blue);
@ -372,7 +372,7 @@ uint8* freerdp_image_convert_15bpp(uint8* srcData, uint8* dstData, int width, in
{
pixel = *src16;
src16++;
GetBGR16(red, green, blue, pixel);
GetBGR15(red, green, blue, pixel);
pixel = BGR32(red, green, blue);
*dst32 = pixel;
dst32++;

2
libfreerdp-gdi/graphics.c
View File

@ -83,7 +83,7 @@ void gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
{
uint16 size;
size = width * height * (bpp / 8);
size = width * height * (bpp + 7) / 8;
if (bitmap->data == NULL)
bitmap->data = (uint8*) xmalloc(size);