1 files changed, 8 insertions, 0 deletions
diff --git a/freerdp/xrdp-color.c b/freerdp/xrdp-color.c
index 0ae11339..1bbdef43 100644
--- a/freerdp/xrdp-color.c
+++ b/freerdp/xrdp-color.c
@@ -187,6 +187,10 @@ convert_bitmap(int in_bpp, int out_bpp, char* bmpdata,
   {
     return bmpdata;
   }
+  if ((in_bpp == 15) && (out_bpp == 15))
+  {
+    return bmpdata;
+  }
   g_writeln("convert_bitmap: error unknown conversion from %d to %d",
             in_bpp, out_bpp);
   return 0;
@@ -265,6 +269,10 @@ convert_color(int in_bpp, int out_bpp, int in_color, int* palette)
   {
     return in_color;
   }
+  if ((in_bpp == 15) && (out_bpp == 15))
+  {
+    return in_color;
+  }
   g_writeln("convert_color: error unknown conversion from %d to %d",
             in_bpp, out_bpp);
   return 0;