diff options
| author | Max Horn | 2008-11-06 15:02:50 +0000 |
|---|---|---|
| committer | Max Horn | 2008-11-06 15:02:50 +0000 |
| commit | edf9f249260b1fd4364f6727fa622991e81e8cf3 (patch) | |
| tree | 2b034d5daf7b69212957d8d51ab839974f51f2c5 /backends/platform/iphone | |
| parent | f238a12b27ebfa9847814b9972fdb5789e484533 (diff) | |
| download | scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.gz scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.bz2 scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.zip | |
Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)
svn-id: r34912
Diffstat (limited to 'backends/platform/iphone')
| -rw-r--r-- | backends/platform/iphone/osys_iphone.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_iphone.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/backends/platform/iphone/osys_iphone.cpp b/backends/platform/iphone/osys_iphone.cpp index 6ca5a52928..d5c126e73b 100644 --- a/backends/platform/iphone/osys_iphone.cpp +++ b/backends/platform/iphone/osys_iphone.cpp @@ -180,7 +180,7 @@ void OSystem_IPHONE::setPalette(const byte *colors, uint start, uint num) { const byte *b = colors; for (uint i = start; i < start + num; ++i) { - _palette[i] = RGBToColor(b[0], b[1], b[2]); + _palette[i] = Graphics::RGBToColor<ColorMasks<565> >(b[0], b[1], b[2]); b += 4; } diff --git a/backends/platform/iphone/osys_iphone.h b/backends/platform/iphone/osys_iphone.h index c743039860..c3d62b7c9c 100644 --- a/backends/platform/iphone/osys_iphone.h +++ b/backends/platform/iphone/osys_iphone.h @@ -143,6 +143,7 @@ public: virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); + virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); } virtual bool showMouse(bool visible); |
