Merge remote-tracking branch 'origin/master'

Conflicts:
	drivers/windows/dir_access_windows.cpp

1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/pvr/RgbBitmap.h b/drivers/pvr/RgbBitmap.h
new file mode 100644
index 0000000000..cf1d78667d
--- /dev/null
+++ b/drivers/pvr/RgbBitmap.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "Bitmap.h"
+#include "ColorRgba.h"
+
+namespace Javelin {
+
+class RgbBitmap : public Bitmap {
+public:
+    RgbBitmap(int w, int h)
+        : Bitmap(w, h, 3) {
+    }
+
+    const ColorRgb<unsigned char> *GetData() const { 
+        return reinterpret_cast<ColorRgb<unsigned char> *>(data); 
+    }
+
+    ColorRgb<unsigned char> *GetData() { 
+        return reinterpret_cast<ColorRgb<unsigned char> *>(data); 
+    }
+};
+
+}