diff options
| author | Willem Jan Palenstijn | 2010-11-05 12:33:07 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2010-11-05 12:33:07 +0000 |
| commit | e065a8a7975d49405a96beec658e207e9826e9cd (patch) | |
| tree | dcc1488ee1d68793d224071e0f80de62d416d4a3 /engines | |
| parent | 4f3cedd11f9af307a08c59a074563637579f5d38 (diff) | |
| download | scummvm-rg350-e065a8a7975d49405a96beec658e207e9826e9cd.tar.gz scummvm-rg350-e065a8a7975d49405a96beec658e207e9826e9cd.tar.bz2 scummvm-rg350-e065a8a7975d49405a96beec658e207e9826e9cd.zip | |
SCI: Fix blend rounding, style
svn-id: r54093
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 876d263440..f5689a956d 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -197,9 +197,9 @@ static byte blendColours(byte c1, byte c2) { // 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) + - 0.5 + (pow (c2/255.0, 2.2/1.0) * 255.0); - return (byte)(0.5 + (pow (0.5*t/255.0, 1.0/2.2) * 255.0)); + double t = (pow(c1/255.0, 2.2/1.0) * 255.0) + + (pow(c2/255.0, 2.2/1.0) * 255.0); + return (byte)(0.5 + (pow(0.5*t/255.0, 1.0/2.2) * 255.0)); } void GfxPalette::setEGA() { |