libfreerdp-codec: return ARGB32/ABGR32 for dstBpp 32 with alpha

FreeRDP · Oct 10, 2012 · 8b70615 · 8b70615
1 parent ddf495a
commit 8b70615
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
@@ -426,7 +426,14 @@ BYTE* freerdp_image_convert_8bpp(BYTE* srcData, BYTE* dstData, int width, int he
 			red = clrconv->palette->entries[pixel].red;
 			green = clrconv->palette->entries[pixel].green;
 			blue = clrconv->palette->entries[pixel].blue;
-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			if (clrconv->alpha)
+			{
+				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
+			}
+			else
+			{
+				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			}
 			*dst32 = pixel;
 			dst32++;
 		}
@@ -468,7 +475,14 @@ BYTE* freerdp_image_convert_15bpp(BYTE* srcData, BYTE* dstData, int width, int h
 			pixel = *src16;
 			src16++;
 			GetBGR15(red, green, blue, pixel);
-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			if (clrconv->alpha)
+			{
+				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
+			}
+			else
+			{
+				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			}
 			*dst32 = pixel;
 			dst32++;
 		}
@@ -582,7 +596,14 @@ BYTE* freerdp_image_convert_16bpp(BYTE* srcData, BYTE* dstData, int width, int h
 			pixel = *src16;
 			src16++;
 			GetBGR16(red, green, blue, pixel);
-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			if (clrconv->alpha)
+			{
+				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
+			}
+			else
+			{
+				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
+			}
 			*dst32 = pixel;
 			dst32++;
 		}