aboutsummaryrefslogtreecommitdiff
path: root/graphics/pixelformat.h
diff options
context:
space:
mode:
authorJordi Vilalta Prat2009-06-30 08:25:08 +0000
committerJordi Vilalta Prat2009-06-30 08:25:08 +0000
commit5e9285e8fa8eb2f0b01abc6caf93dc926f41d795 (patch)
treeae81b455ff96ee6c1bd7a3de178179a883c84b23 /graphics/pixelformat.h
parent9e1916bcad3cc33a870bdbff5bd01b39e523492d (diff)
downloadscummvm-rg350-5e9285e8fa8eb2f0b01abc6caf93dc926f41d795.tar.gz
scummvm-rg350-5e9285e8fa8eb2f0b01abc6caf93dc926f41d795.tar.bz2
scummvm-rg350-5e9285e8fa8eb2f0b01abc6caf93dc926f41d795.zip
Fixed a few formatting bits
svn-id: r41973
Diffstat (limited to 'graphics/pixelformat.h')
-rw-r--r--graphics/pixelformat.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h
index a773a42d76..30c8aaa447 100644
--- a/graphics/pixelformat.h
+++ b/graphics/pixelformat.h
@@ -64,66 +64,66 @@ struct PixelFormat {
rShift = RShift, gShift = GShift, bShift = BShift, aShift = AShift;
}
- //"Factory" methods for convenience
+ // "Factory" methods for convenience
static inline PixelFormat createFormatCLUT8() {
- return PixelFormat(1,8,8,8,8,0,0,0,0);
+ return PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0);
}
#ifdef ENABLE_RGB_COLOR
- //2 Bytes-per-pixel modes
+ // 2 Bytes-per-pixel modes
static inline PixelFormat createFormatRGB555() {
- return PixelFormat(2,3,3,3,8,10,5,0,0);
+ return PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0);
}
static inline PixelFormat createFormatBGR555() {
- return PixelFormat(2,3,3,3,8,0,5,10,0);
+ return PixelFormat(2, 3, 3, 3, 8, 0, 5, 10, 0);
}
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);
+ // Special case, alpha bit is always high in this mode.
+ return PixelFormat(2, 3, 3, 3, 7, 10, 5, 0, 15);
}
static inline PixelFormat createFormatXBGR1555() {
- //Special case, alpha bit is always high in this mode.
- return PixelFormat(2,3,3,3,7,0,5,10,15);
+ // Special case, alpha bit is always high in this mode.
+ return PixelFormat(2, 3, 3, 3, 7, 0, 5, 10, 15);
}
static inline PixelFormat createFormatRGB565() {
- return PixelFormat(2,3,2,3,8,11,5,0,0);
+ return PixelFormat(2, 3, 2, 3, 8, 11, 5, 0, 0);
}
static inline PixelFormat createFormatBGR565() {
- return PixelFormat(2,3,2,3,8,0,5,11,0);
+ return PixelFormat(2, 3, 2, 3, 8, 0, 5, 11, 0);
}
static inline PixelFormat createFormatRGBA4444() {
- return PixelFormat(2,4,4,4,4,12,8,4,0);
+ return PixelFormat(2, 4, 4, 4, 4, 12, 8, 4, 0);
}
static inline PixelFormat createFormatARGB4444() {
- return PixelFormat(2,4,4,4,4,8,4,0,12);
+ return PixelFormat(2, 4, 4, 4, 4, 8, 4, 0, 12);
}
static inline PixelFormat createFormatABGR4444() {
- return PixelFormat(2,4,4,4,4,0,4,8,12);
+ return PixelFormat(2, 4, 4, 4, 4, 0, 4, 8, 12);
}
static inline PixelFormat createFormatBGRA4444() {
- return PixelFormat(2,4,4,4,4,4,8,12,0);
+ return PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0);
}
#ifdef ENABLE_32BIT
- //3 to 4 byte per pixel modes
+ // 3 to 4 byte per pixel modes
static inline PixelFormat createFormatRGB888() {
- return PixelFormat(3,0,0,0,8,16,8,0,0);
+ return PixelFormat(3, 0, 0, 0, 8, 16, 8, 0, 0);
}
static inline PixelFormat createFormatBGR888() {
- return PixelFormat(3,0,0,0,8,0,8,16,0);
+ return PixelFormat(3, 0, 0, 0, 8, 0, 8, 16, 0);
}
static inline PixelFormat createFormatRGBA8888() {
- return PixelFormat(4,0,0,0,0,24,16,8,0);
+ return PixelFormat(4, 0, 0, 0, 0, 24, 16, 8, 0);
}
static inline PixelFormat createFormatARGB8888() {
- return PixelFormat(4,0,0,0,0,16,8,0,24);
+ return PixelFormat(4, 0, 0, 0, 0, 16 ,8, 0, 24);
}
static inline PixelFormat createFormatABGR8888() {
- return PixelFormat(4,0,0,0,0,0,8,16,24);
+ return PixelFormat(4, 0, 0, 0, 0, 0, 8, 16, 24);
}
static inline PixelFormat createFormatBGRA8888() {
- return PixelFormat(4,0,0,0,0,8,16,24,0);
+ return PixelFormat(4, 0, 0, 0, 0, 8, 16, 24, 0);
}
-#endif //ENABLE_32BIT
-#endif //ENABLE_RGB_COLOR
+#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.