diff options
| author | Max Horn | 2009-01-27 01:46:29 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-27 01:46:29 +0000 |
| commit | e338205066c7d794973e8f31e943ac7d1339bdec (patch) | |
| tree | 07ab02e9e63fec6232bbcb46094d659729442aef /graphics/scaler.cpp | |
| parent | 379fe274dfe713c508cff6908444ae87c722d124 (diff) | |
| download | scummvm-rg350-e338205066c7d794973e8f31e943ac7d1339bdec.tar.gz scummvm-rg350-e338205066c7d794973e8f31e943ac7d1339bdec.tar.bz2 scummvm-rg350-e338205066c7d794973e8f31e943ac7d1339bdec.zip | |
Added new interpolate16_1_1_1_1 func, got rid of interpolate32_1_1_1_1
svn-id: r36090
Diffstat (limited to 'graphics/scaler.cpp')
| -rw-r--r-- | graphics/scaler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index afee8be92d..adfcda128d 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -222,8 +222,8 @@ void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } } -#define interpolate32_1_1 interpolate32_1_1<bitFormat> -#define interpolate32_1_1_1_1 interpolate32_1_1_1_1<bitFormat> +#define interpolate_1_1 interpolate16_1_1<Graphics::ColorMasks<bitFormat> > +#define interpolate_1_1_1_1 interpolate16_1_1_1_1<Graphics::ColorMasks<bitFormat> > /** * Trivial nearest-neighbour 1.5x scaler. @@ -246,13 +246,13 @@ void Normal1o5xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin uint16 color3 = *(((const uint16 *)(srcPtr + srcPitch)) + i + 1); *(uint16 *)(r + 0) = color0; - *(uint16 *)(r + 2) = interpolate32_1_1(color0, color1); + *(uint16 *)(r + 2) = interpolate_1_1(color0, color1); *(uint16 *)(r + 4) = color1; - *(uint16 *)(r + 0 + dstPitch) = interpolate32_1_1(color0, color2); - *(uint16 *)(r + 2 + dstPitch) = interpolate32_1_1_1_1(color0, color1, color2, color3); - *(uint16 *)(r + 4 + dstPitch) = interpolate32_1_1(color1, color3); + *(uint16 *)(r + 0 + dstPitch) = interpolate_1_1(color0, color2); + *(uint16 *)(r + 2 + dstPitch) = interpolate_1_1_1_1(color0, color1, color2, color3); + *(uint16 *)(r + 4 + dstPitch) = interpolate_1_1(color1, color3); *(uint16 *)(r + 0 + dstPitch2) = color2; - *(uint16 *)(r + 2 + dstPitch2) = interpolate32_1_1(color2, color3); + *(uint16 *)(r + 2 + dstPitch2) = interpolate_1_1(color2, color3); *(uint16 *)(r + 4 + dstPitch2) = color3; } srcPtr += srcPitch2; |