[Scummvm-cvs-logs] SF.net SVN: scummvm:[41985] scummvm/branches/gsoc2009-16bit/graphics/ pixelformat.h

[upthorn at users.sourceforge.net]

Revision: 41985
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41985&view=rev
Author:   upthorn
Date:     2009-07-01 04:06:13 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
Allowed for 16, 24, and 32 bit pixel format factory constructors to be used without backend RGB color support

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h

Modified: scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-07-01 01:43:20 UTC (rev 41984)
+++ scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-07-01 04:06:13 UTC (rev 41985)
@@ -68,7 +68,6 @@
 	static inline PixelFormat createFormatCLUT8() { 
 		return PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0);
 	}
-#ifdef ENABLE_RGB_COLOR
 	// 2 Bytes-per-pixel modes
 	static inline PixelFormat createFormatRGB555() {
 		return PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0);
@@ -102,7 +101,6 @@
 	static inline PixelFormat createFormatBGRA4444() {
 		return PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0);
 	}
-#ifdef ENABLE_32BIT
 	// 3 to 4 byte per pixel modes
 	static inline PixelFormat createFormatRGB888() {
 		return PixelFormat(3, 0, 0, 0, 8, 16, 8, 0, 0);
@@ -122,8 +120,6 @@
 	static inline PixelFormat createFormatBGRA8888() {
 		return PixelFormat(4, 0, 0, 0, 0, 8, 16, 24, 0);
 	}
-#endif // ENABLE_32BIT
-#endif // ENABLE_RGB_COLOR
 
 	inline bool operator==(const PixelFormat &fmt) const {
 		// TODO: If aLoss==8, then the value of aShift is irrelevant, and should be ignored.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.