diff options
| author | Paweł Kołodziejski | 2003-06-22 15:06:48 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-06-22 15:06:48 +0000 |
| commit | 288f101bc96ac318550fc57f8c65076bf7ad03e4 (patch) | |
| tree | b0cb92ee51d2887e4341e403b4786b706981b142 /common | |
| parent | 87b5f750e7bf84ea592b19bbfd5ac91d827c8caf (diff) | |
| download | scummvm-rg350-288f101bc96ac318550fc57f8c65076bf7ad03e4.tar.gz scummvm-rg350-288f101bc96ac318550fc57f8c65076bf7ad03e4.tar.bz2 scummvm-rg350-288f101bc96ac318550fc57f8c65076bf7ad03e4.zip | |
fixed warning
svn-id: r8623
Diffstat (limited to 'common')
| -rw-r--r-- | common/scaler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp index a0a49ad5eb..fcf88c6b94 100644 --- a/common/scaler.cpp +++ b/common/scaler.cpp @@ -655,7 +655,7 @@ static inline uint16 interpolate5(uint16 A, uint16 B, int scale) { uint16 g = (uint16)(((A & greenMask) * scale + (B & greenMask) * (5 - scale)) / 5); uint16 b = (uint16)(((A & blueMask) * scale + (B & blueMask) * (5 - scale)) / 5); - return (r & redMask) | (g & greenMask) | (b & blueMask); + return (uint16)((r & redMask) | (g & greenMask) | (b & blueMask)); } static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int scale, int width) { |