aboutsummaryrefslogtreecommitdiff
path: root/engines/cine
diff options
context:
space:
mode:
authorChris Apers2010-01-31 18:08:51 +0000
committerChris Apers2010-01-31 18:08:51 +0000
commit3ed2192923a146ee4b3f0784396d8e5479d68778 (patch)
tree7f1d4153be181f33b87307d9a06a0797d24fef86 /engines/cine
parent699a525db4f932095bd5b2033b4293446e1e30cf (diff)
downloadscummvm-rg350-3ed2192923a146ee4b3f0784396d8e5479d68778.tar.gz
scummvm-rg350-3ed2192923a146ee4b3f0784396d8e5479d68778.tar.bz2
scummvm-rg350-3ed2192923a146ee4b3f0784396d8e5479d68778.zip
Prevent my compiler to crash and object copy hopefully it doesn't break something
svn-id: r47766
Diffstat (limited to 'engines/cine')
-rw-r--r--engines/cine/pal.cpp2
-rw-r--r--engines/cine/pal.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index 9210fae8ab..f383b0d9f2 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -269,7 +269,7 @@ Palette &Palette::saturatedAddNormalizedGray(Palette& output, byte firstIndex, b
}
// 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());
diff --git a/engines/cine/pal.h b/engines/cine/pal.h
index 4d32aca408..149677184e 100644
--- a/engines/cine/pal.h
+++ b/engines/cine/pal.h
@@ -186,7 +186,7 @@ public:
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