diff options
| author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
| commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
| tree | 8c51419daa486f1d4833757db4715dadab6c3497 /graphics/scaler/aspect.cpp | |
| parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
| parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
| download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'graphics/scaler/aspect.cpp')
| -rw-r--r-- | graphics/scaler/aspect.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp index 85768fbced..85b79ab6cd 100644 --- a/graphics/scaler/aspect.cpp +++ b/graphics/scaler/aspect.cpp @@ -79,10 +79,7 @@ static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint1 } } else { while (width--) { - // TODO: We really would like to use interpolate16_5_3, but that - // does not exist (yet), so we use this trick instead. - uint16 tmp = *srcA++; - *dst++ = interpolate16_5_2_1<ColorMask>(*srcB++, tmp, tmp); + *dst++ = interpolate16_5_3<ColorMask>(*srcB++, *srcA++); } } } |