summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspeidy <speidy@gmail.com>2016-04-19 18:02:48 -0400
committerspeidy <speidy@gmail.com>2016-05-12 17:21:15 -0400
commitf20e06ff4267465086ca9eac4d6bf6e06707de37 (patch)
tree7dbf996ee53f483e659be3cd952426e03ef9503a
parenteb2bbcfc9f8f3ee0c70b552dd981b99d0e9ff59f (diff)
downloadxrdp-proprietary-f20e06ff4267465086ca9eac4d6bf6e06707de37.tar.gz
xrdp-proprietary-f20e06ff4267465086ca9eac4d6bf6e06707de37.zip
neutrinordp: added 16bpp to 32bpp pixel color conversion
-rw-r--r--neutrinordp/xrdp-color.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/neutrinordp/xrdp-color.c b/neutrinordp/xrdp-color.c
index 8201e918..34afc67c 100644
--- a/neutrinordp/xrdp-color.c
+++ b/neutrinordp/xrdp-color.c
@@ -292,6 +292,14 @@ convert_color(int in_bpp, int out_bpp, int in_color, int *palette)
return pixel;
}
+ if ((in_bpp == 16) && (out_bpp == 32))
+ {
+ pixel = in_color;
+ SPLITCOLOR16(red, green, blue, pixel);
+ pixel = COLOR24BGR(red, green, blue);
+ return pixel;
+ }
+
if ((in_bpp == 24) && (out_bpp == 24))
{
return in_color;