Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h

1 files changed, 13 insertions, 8 deletions

diff --git a/graphics/surface.h b/graphics/surface.h
index f9cb6cc474..1b54690aa9 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -26,7 +26,12 @@
 #define GRAPHICS_SURFACE_H
 
 #include "common/scummsys.h"
-#include "common/rect.h"
+
+namespace Common {
+struct Rect;
+}
+
+#include "graphics/pixelformat.h"
 
 namespace Graphics {
 
@@ -65,14 +70,14 @@ struct Surface {
 	void *pixels;
 
 	/**
-	 * How many bytes a single pixel occupies.
+	 * The pixel format of the surface.
 	 */
-	uint8 bytesPerPixel;
+	PixelFormat format;
 
 	/**
 	 * Construct a simple Surface object.
 	 */
-	Surface() : w(0), h(0), pitch(0), pixels(0), bytesPerPixel(0) {
+	Surface() : w(0), h(0), pitch(0), pixels(0), format() {
 	}
 
 	/**
@@ -83,7 +88,7 @@ struct Surface {
 	 * @return Pointer to the pixel.
 	 */
 	inline const void *getBasePtr(int x, int y) const {
-		return (const byte *)(pixels) + y * pitch + x * bytesPerPixel;
+		return (const byte *)(pixels) + y * pitch + x * format.bytesPerPixel;
 	}
 
 	/**
@@ -94,7 +99,7 @@ struct Surface {
 	 * @return Pointer to the pixel.
 	 */
 	inline void *getBasePtr(int x, int y) {
-		return static_cast<byte *>(pixels) + y * pitch + x * bytesPerPixel;
+		return static_cast<byte *>(pixels) + y * pitch + x * format.bytesPerPixel;
 	}
 
 	/**
@@ -105,9 +110,9 @@ struct Surface {
 	 *
 	 * @param width Width of the surface object.
 	 * @param height Height of the surface object.
-	 * @param bytePP The number of bytes a single pixel uses.
+	 * @param format The pixel format the surface should use.
 	 */
-	void create(uint16 width, uint16 height, uint8 bytesPP);
+	void create(uint16 width, uint16 height, const PixelFormat &format);
 
 	/**
 	 * Release the memory used by the pixels memory of this surface. This is the