[Scummvm-cvs-logs] SF.net SVN: scummvm: [21968] scummvm/trunk/graphics/colormasks.h
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Apr 17 03:45:00 CEST 2006
Revision: 21968
Author: fingolfin
Date: 2006-04-17 03:44:02 -0700 (Mon, 17 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21968&view=rev
Log Message:
-----------
Since we define alpha value 255 to mean 'opaque', or T::kAlphaMask into the result of RGBToColor
Modified Paths:
--------------
scummvm/trunk/graphics/colormasks.h
Modified: scummvm/trunk/graphics/colormasks.h
===================================================================
--- scummvm/trunk/graphics/colormasks.h 2006-04-17 10:41:18 UTC (rev 21967)
+++ scummvm/trunk/graphics/colormasks.h 2006-04-17 10:44:02 UTC (rev 21968)
@@ -219,7 +219,8 @@
template<class T>
uint32 RGBToColor(uint8 r, uint8 g, uint8 b) {
- return ((r << T::kRedShift) & T::kRedMask) |
+ return T::kAlphaMask |
+ ((r << T::kRedShift) & T::kRedMask) |
((g << T::kGreenShift) & T::kGreenMask) |
((b << T::kBlueShift) & T::kBlueMask);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list