aboutsummaryrefslogtreecommitdiff
path: root/graphics/pixelformat.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-06-20 05:08:07 +0000
committerTorbjörn Andersson2009-06-20 05:08:07 +0000
commit8b6ed92376024f43876af93fdfccd72d6fc33ac0 (patch)
treeadf7e5bf0239658b25246b08f2a23177c8b7401c /graphics/pixelformat.h
parent704386d3b09b68f96b6d4160a1a261e3e754f461 (diff)
downloadscummvm-rg350-8b6ed92376024f43876af93fdfccd72d6fc33ac0.tar.gz
scummvm-rg350-8b6ed92376024f43876af93fdfccd72d6fc33ac0.tar.bz2
scummvm-rg350-8b6ed92376024f43876af93fdfccd72d6fc33ac0.zip
Fixed compilation.
svn-id: r41695
Diffstat (limited to 'graphics/pixelformat.h')
-rw-r--r--graphics/pixelformat.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h
index 899ef3bdd7..4ad1f8b400 100644
--- a/graphics/pixelformat.h
+++ b/graphics/pixelformat.h
@@ -67,30 +67,30 @@ struct PixelFormat {
//"Factory" methods for convenience
//TODO: BGR support
//TODO: Specify alpha position
- static inline PixelFormat PixelFormat::createFormatCLUT8() {
+ static inline PixelFormat createFormatCLUT8() {
return PixelFormat(1,8,8,8,8,0,0,0,0);
}
#if (defined ENABLE_16BIT) || (defined ENABLE_32BIT) //TODO: more generic define instead of ENABLE_16BIT
//2 Bytes-per-pixel modes
- static inline PixelFormat PixelFormat::createFormatRGB555() {
+ static inline PixelFormat createFormatRGB555() {
return PixelFormat(2,3,3,3,8,10,5,0,0);
}
- static inline PixelFormat PixelFormat::createFormatXRGB1555() {
+ static inline PixelFormat createFormatXRGB1555() {
//Special case, alpha bit is always high in this mode.
return PixelFormat(2,3,3,3,7,10,5,0,15);
}
- static inline PixelFormat PixelFormat::createFormatRGB565() {
+ static inline PixelFormat createFormatRGB565() {
return PixelFormat(2,3,2,3,8,11,5,0,0);
}
- static inline PixelFormat PixelFormat::createFormatRGBA4444() {
+ static inline PixelFormat createFormatRGBA4444() {
return PixelFormat(2,4,4,4,4,12,8,4,0);
}
#ifdef ENABLE_32BIT
//3 to 4 byte per pixel modes
- static inline PixelFormat PixelFormat::createFormatRGB888() {
+ static inline PixelFormat createFormatRGB888() {
return PixelFormat(3,0,0,0,8,16,8,0,0);
}
- static inline PixelFormat PixelFormat::createFormatRGBA8888() {
+ static inline PixelFormat createFormatRGBA8888() {
return PixelFormat(4,0,0,0,0,24,16,8,0);
}
#endif //ENABLE_32BIT