[Scummvm-cvs-logs] SF.net SVN: scummvm:[36312] scummvm/branches/branch-0-13-0/graphics/ VectorRendererSpec.cpp

[fingolfin at users.sourceforge.net]

Revision: 36312
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36312&view=rev
Author:   fingolfin
Date:     2009-02-13 19:25:26 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Backported VectorRendererSpec::calcGradient fix

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/graphics/VectorRendererSpec.cpp

Modified: scummvm/branches/branch-0-13-0/graphics/VectorRendererSpec.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/graphics/VectorRendererSpec.cpp	2009-02-13 19:24:32 UTC (rev 36311)
+++ scummvm/branches/branch-0-13-0/graphics/VectorRendererSpec.cpp	2009-02-13 19:25:26 UTC (rev 36312)
@@ -418,9 +418,9 @@
 	PixelType output = 0;
 	pos = (MIN(pos * Base::_gradientFactor, max) << 12) / max;
 
-	output |= (_gradientStart + ((Base::_gradientBytes[0] * pos) >> 12)) & PixelFormat::kRedMask;
-	output |= (_gradientStart + ((Base::_gradientBytes[1] * pos) >> 12)) & PixelFormat::kGreenMask;
-	output |= (_gradientStart + ((Base::_gradientBytes[2] * pos) >> 12)) & PixelFormat::kBlueMask;
+	output |= ((_gradientStart & PixelFormat::kRedMask) + ((Base::_gradientBytes[0] * pos) >> 12)) & PixelFormat::kRedMask;
+	output |= ((_gradientStart & PixelFormat::kGreenMask) + ((Base::_gradientBytes[1] * pos) >> 12)) & PixelFormat::kGreenMask;
+	output |= ((_gradientStart & PixelFormat::kBlueMask) + ((Base::_gradientBytes[2] * pos) >> 12)) & PixelFormat::kBlueMask;
 	output |= ~(PixelFormat::kRedMask | PixelFormat::kGreenMask | PixelFormat::kBlueMask);
 
 	return output;


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