Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)

svn-id: r34912

1 files changed, 1 insertions, 18 deletions

diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 16c8f41491..27adf88198 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -113,9 +113,7 @@ public:
 	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	virtual int16 getOverlayHeight();
 	virtual int16 getOverlayWidth();
-
-	inline virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
-	inline virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
+	virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); }
 	
 	virtual bool showMouse(bool visible);
 
@@ -190,19 +188,4 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0},
 };
 
-OverlayColor OSystem_DS::RGBToColor(uint8 r, uint8 g, uint8 b)
-{
-	return 0x8000 | (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10);
-	//consolePrintf("rgbtocol\n");
-	//return 0;
-}
-
-void OSystem_DS::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b)
-{
-	r = (color & 0x001F) << 3;
-	g = ((color & 0x03E0) >> 5) << 3;
-	b = ((color & 0x7C00) >> 10) << 3;
-	//consolePrintf("coltorgb\n");
-}
-
 #endif