aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2008-11-06 14:27:13 +0000
committerMax Horn2008-11-06 14:27:13 +0000
commitf238a12b27ebfa9847814b9972fdb5789e484533 (patch)
treefe14180f721904c41ec9f958198338b3ca55ef68 /common
parent38a4eaa001f89fa201125fbe1b82f6f539ecda12 (diff)
downloadscummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.tar.gz
scummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.tar.bz2
scummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.zip
Got rid of OSystem::ARGBToColor and colorToARGB
svn-id: r34911
Diffstat (limited to 'common')
-rw-r--r--common/system.cpp9
-rw-r--r--common/system.h24
2 files changed, 0 insertions, 33 deletions
diff --git a/common/system.cpp b/common/system.cpp
index dc692b2e9e..1c9f0cd352 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -69,15 +69,6 @@ void OSystem::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
Graphics::colorToRGB<Graphics::ColorMasks<565> >(color, r, g, b);
}
-OverlayColor OSystem::ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b) {
- return RGBToColor(r, g, b);
-}
-
-void OSystem::colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b) {
- colorToRGB(color, r, g, b);
- a = 255;
-}
-
void OSystem::displayMessageOnOSD(const char *msg) {
// Display the message for 1.5 seconds
GUI::TimedMessageDialog dialog(msg, 1500);
diff --git a/common/system.h b/common/system.h
index 08ca6c5f0d..c24ca2f343 100644
--- a/common/system.h
+++ b/common/system.h
@@ -623,7 +623,6 @@ public:
* implementation generates a 16 bit color value, in the 565 format
* (that is, 5 bits red, 6 bits green, 5 bits blue).
* @see colorToRGB
- * @see ARGBToColor
*/
virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
@@ -633,32 +632,9 @@ public:
* implementation takes a 16 bit color value and assumes it to be in 565 format
* (that is, 5 bits red, 6 bits green, 5 bits blue).
* @see RGBToColor
- * @see colorToARGB
*/
virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
- /**
- * Convert the given ARGB quadruplet into an OverlayColor. A OverlayColor can
- * be 8bit, 16bit or 32bit, depending on the target system. The default
- * implementation generates a 16 bit color value, in the 565 format
- * (that is, 5 bits red, 6 bits green, 5 bits blue).
- * @note The alpha component, ranges from 0 (transparent) to 255 (opaque).
- * @see colorToRGB
- * @see RGBToColor
- */
- virtual OverlayColor ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b);
-
- /**
- * Convert the given OverlayColor into an ARGB quadruplet. An OverlayColor can
- * be 8bit, 16bit or 32bit, depending on the target system. The default
- * implementation takes a 16 bit color value and assumes it to be in 565 format
- * (that is, 5 bits red, 6 bits green, 5 bits blue).
- * @note The alpha component, ranges from 0 (transparent) to 255 (opaque).
- * @see ARGBToColor
- * @see colorToRGB
- */
- virtual void colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b);
-
//@}