diff options
| author | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-05 11:45:25 -0400 |
| commit | f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19 (patch) | |
| tree | 42510da50bdf8515a577fdd74622539ff829ef78 /graphics | |
| parent | 2f9b1b67b08f1b70cd95795aaf7816ca7f991649 (diff) | |
| parent | 058b9b9aca066c886ceb4e454a5541be70c27cb6 (diff) | |
| download | scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.gz scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.tar.bz2 scummvm-rg350-f35e820e9f2f4c2f8b9c6d3b572d588fccf99f19.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/scaler/aspect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp index f0ae732a40..2f06b2e4f6 100644 --- a/graphics/scaler/aspect.cpp +++ b/graphics/scaler/aspect.cpp @@ -56,7 +56,7 @@ static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint1 #if ASPECT_MODE == kVeryFastAndGoodAspectMode template<typename ColorMask, int scale> -static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width) { +static void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width) { if (scale == 1) { while (width--) { *dst++ = interpolate16_7_1<ColorMask>(*srcB++, *srcA++); |