[Scummvm-cvs-logs] SF.net SVN: scummvm:[54071] scummvm/trunk/engines/sci/graphics/palette.cpp
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Thu Nov 4 20:45:38 CET 2010
Revision: 54071
http://scummvm.svn.sourceforge.net/scummvm/?rev=54071&view=rev
Author: wjpalenstijn
Date: 2010-11-04 19:45:38 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
SCI: Fix precedence error in comment
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/palette.cpp
Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp 2010-11-04 19:19:07 UTC (rev 54070)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp 2010-11-04 19:45:38 UTC (rev 54071)
@@ -193,8 +193,8 @@
}
static byte blendColours(byte c1, byte c2) {
- // linear:
- // return (c1/2+c2/2)+(c1&1+c2&1)/2;
+ // linear
+ // return (c1/2+c2/2)+((c1&1)+(c2&1))/2;
// gamma 2.2
double t = 0.5 + (pow (c1/255.0, 2.2/1.0) * 255.0) +
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