[Scummvm-cvs-logs] SF.net SVN: scummvm:[47766] scummvm/trunk/engines/cine
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sun Jan 31 19:08:51 CET 2010
Revision: 47766
http://scummvm.svn.sourceforge.net/scummvm/?rev=47766&view=rev
Author: chrilith
Date: 2010-01-31 18:08:51 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Prevent my compiler to crash and object copy hopefully it doesn't break something
Modified Paths:
--------------
scummvm/trunk/engines/cine/pal.cpp
scummvm/trunk/engines/cine/pal.h
Modified: scummvm/trunk/engines/cine/pal.cpp
===================================================================
--- scummvm/trunk/engines/cine/pal.cpp 2010-01-31 18:01:49 UTC (rev 47765)
+++ scummvm/trunk/engines/cine/pal.cpp 2010-01-31 18:08:51 UTC (rev 47766)
@@ -269,7 +269,7 @@
}
// a.k.a. transformColor
-Cine::Palette::Color Palette::saturatedAddColor(Cine::Palette::Color baseColor, signed r, signed g, signed b) const {
+Cine::Palette::Color &Palette::saturatedAddColor(Cine::Palette::Color baseColor, signed r, signed g, signed b) const {
Cine::Palette::Color result;
result.r = CLIP<int>(baseColor.r + r, 0, _format.rMax());
result.g = CLIP<int>(baseColor.g + g, 0, _format.gMax());
Modified: scummvm/trunk/engines/cine/pal.h
===================================================================
--- scummvm/trunk/engines/cine/pal.h 2010-01-31 18:01:49 UTC (rev 47765)
+++ scummvm/trunk/engines/cine/pal.h 2010-01-31 18:08:51 UTC (rev 47766)
@@ -186,7 +186,7 @@
private:
void setColorFormat(const Graphics::PixelFormat format);
- Cine::Palette::Color saturatedAddColor(Cine::Palette::Color baseColor, signed r, signed g, signed b) const;
+ Cine::Palette::Color &saturatedAddColor(Cine::Palette::Color baseColor, signed r, signed g, signed b) const;
private:
Graphics::PixelFormat _format; ///< The used source color format
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