fixes from ArvidNorr

2012-05-07 11:00:32 -07:00
parent 9a03ab966d
commit 3e422c04c6
4 changed files with 40 additions and 23 deletions
@@ -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;