diff options
author | Johannes Schickel | 2008-11-03 14:02:29 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-11-03 14:02:29 +0000 |
commit | b58aca856c642515fa5e6108680c303f30f816aa (patch) | |
tree | 83aec73d10dbbb1a650e4600d38fe4a72022d165 | |
parent | 985c02ee7da43fb66b61d6e3c5530e78bd2d8286 (diff) | |
download | scummvm-rg350-b58aca856c642515fa5e6108680c303f30f816aa.tar.gz scummvm-rg350-b58aca856c642515fa5e6108680c303f30f816aa.tar.bz2 scummvm-rg350-b58aca856c642515fa5e6108680c303f30f816aa.zip |
Simplified Graphics::createPixelFormatFromMask helper.
svn-id: r34876
-rw-r--r-- | graphics/colormasks.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/graphics/colormasks.h b/graphics/colormasks.h index e8048f6d64..983579e545 100644 --- a/graphics/colormasks.h +++ b/graphics/colormasks.h @@ -275,21 +275,21 @@ struct PixelFormat { uint32 rMask, gMask, bMask, aMask; /**< Binary mask used to retrieve individual color values. */ }; -template<class Mask> -PixelFormat createPixelFormatFromMask() { +template<int bitFormat> +PixelFormat createPixelFormat() { PixelFormat format; - format.bytesPerPixel = Mask::kBytesPerPixel; + format.bytesPerPixel = ColorMasks<bitFormat>::kBytesPerPixel; - format.rLoss = 8 - Mask::kRedBits; - format.gLoss = 8 - Mask::kGreenBits; - format.bLoss = 8 - Mask::kBlueBits; - format.aLoss = 8 - Mask::kAlphaBits; + format.rLoss = 8 - ColorMasks<bitFormat>::kRedBits; + format.gLoss = 8 - ColorMasks<bitFormat>::kGreenBits; + format.bLoss = 8 - ColorMasks<bitFormat>::kBlueBits; + format.aLoss = 8 - ColorMasks<bitFormat>::kAlphaBits; - format.rShift = Mask::kRedShift; - format.gShift = Mask::kGreenShift; - format.bShift = Mask::kBlueShift; - format.aShift = Mask::kAlphaShift; + format.rShift = ColorMasks<bitFormat>::kRedShift; + format.gShift = ColorMasks<bitFormat>::kGreenShift; + format.bShift = ColorMasks<bitFormat>::kBlueShift; + format.aShift = ColorMasks<bitFormat>::kAlphaShift; return format; } |