[Scummvm-cvs-logs] SF.net SVN: scummvm: [22773] scummvm/trunk/gui/ThemeNew.cpp

[lordhoto at users.sourceforge.net]

Revision: 22773
Author:   lordhoto
Date:     2006-05-30 09:48:15 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22773&view=rev

Log Message:
-----------
Should fix drawing on systems with alpha mask.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-05-30 16:19:56 UTC (rev 22772)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-05-30 16:48:15 UTC (rev 22773)
@@ -1638,6 +1638,7 @@
 	output |= ((alpha * ((col1 & T::kRedMask) - (col2 & T::kRedMask)) >> 8) + (col2 & T::kRedMask)) & T::kRedMask;
 	output |= ((alpha * ((col1 & T::kGreenMask) - (col2 & T::kGreenMask)) >> 8) + (col2 & T::kGreenMask)) & T::kGreenMask;
 	output |= ((alpha * ((col1 & T::kBlueMask) - (col2 & T::kBlueMask)) >> 8) + (col2 & T::kBlueMask)) & T::kBlueMask;
+	output |= ~(T::kRedMask | T::kGreenMask | T::kBlueMask);
 	return output;
 }
 
@@ -1648,6 +1649,7 @@
 	output |= ((alpha * ((~col1 & T::kRedMask) - (col2 & T::kRedMask)) >> 8) + (col2 & T::kRedMask)) & T::kRedMask;
 	output |= ((alpha * ((~col1 & T::kGreenMask) - (col2 & T::kGreenMask)) >> 8) + (col2 & T::kGreenMask)) & T::kGreenMask;
 	output |= ((alpha * ((~col1 & T::kBlueMask) - (col2 & T::kBlueMask)) >> 8) + (col2 & T::kBlueMask)) & T::kBlueMask;
+	output |= ~(T::kRedMask | T::kGreenMask | T::kBlueMask);
 	return output;
 }
 
@@ -1673,6 +1675,7 @@
 	output |= (start + ((((end & T::kRedMask) - (start & T::kRedMask))) * pos >> 12)) & T::kRedMask;
 	output |= (start + ((((end & T::kGreenMask) - (start & T::kGreenMask))) * pos >> 12)) & T::kGreenMask;
 	output |= (start + ((((end & T::kBlueMask) - (start & T::kBlueMask))) * pos >> 12)) & T::kBlueMask;
+	output |= ~(T::kRedMask | T::kGreenMask | T::kBlueMask);
 	return output;
 }
 


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