[Scummvm-cvs-logs] SF.net SVN: scummvm:[34876] scummvm/trunk/graphics/colormasks.h

[lordhoto at users.sourceforge.net]

Revision: 34876
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34876&view=rev
Author:   lordhoto
Date:     2008-11-03 14:02:29 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
Simplified Graphics::createPixelFormatFromMask helper.

Modified Paths:
--------------
    scummvm/trunk/graphics/colormasks.h

Modified: scummvm/trunk/graphics/colormasks.h
===================================================================
--- scummvm/trunk/graphics/colormasks.h	2008-11-03 13:44:59 UTC (rev 34875)
+++ scummvm/trunk/graphics/colormasks.h	2008-11-03 14:02:29 UTC (rev 34876)
@@ -275,21 +275,21 @@
 	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;
 }


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