Committed my patch #2216641 "GRAPHICS: PixelFormat introduction".

svn-id: r34875

2 files changed, 10 insertions, 2 deletions

diff --git a/common/system.cpp b/common/system.cpp
index a07ffba6d6..dc692b2e9e 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -62,11 +62,11 @@ bool OSystem::setGraphicsMode(const char *name) {
 }
 
 OverlayColor OSystem::RGBToColor(uint8 r, uint8 g, uint8 b) {
-	return ::RGBToColor<ColorMasks<565> >(r, g, b);
+	return Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
 }
 
 void OSystem::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-	::colorToRGB<ColorMasks<565> >(color, r, g, b);
+	Graphics::colorToRGB<Graphics::ColorMasks<565> >(color, r, g, b);
 }
 
 OverlayColor OSystem::ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b) {
diff --git a/common/system.h b/common/system.h
index dc543814e4..08ca6c5f0d 100644
--- a/common/system.h
+++ b/common/system.h
@@ -31,6 +31,8 @@
 #include "common/noncopyable.h"
 #include "common/rect.h"
 
+#include "graphics/colormasks.h"
+
 namespace Audio {
 	class Mixer;
 }
@@ -571,6 +573,12 @@ public:
 	virtual void hideOverlay() = 0;
 
 	/**
+	 * Returns the pixel format description of the overlay.
+	 * @see Graphics::PixelFormat
+	 */
+	virtual Graphics::PixelFormat getOverlayFormat() const = 0;
+
+	/**
 	 * Reset the overlay.
 	 *
 	 * After calling this method while the overlay mode is active, the user