diff options
| author | Max Horn | 2006-04-17 18:17:02 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-17 18:17:02 +0000 |
| commit | b47e531425a00cd29e81d4ad98b3be2fd6f4189b (patch) | |
| tree | 786ce1004f15840ace3de92f9db25cc6c0d729a7 /graphics/scaler.cpp | |
| parent | bdd5a25c16096604fa3001900699e2e8cec9cced (diff) | |
| download | scummvm-rg350-b47e531425a00cd29e81d4ad98b3be2fd6f4189b.tar.gz scummvm-rg350-b47e531425a00cd29e81d4ad98b3be2fd6f4189b.tar.bz2 scummvm-rg350-b47e531425a00cd29e81d4ad98b3be2fd6f4189b.zip | |
Renamed and merge some of the pixel interpolation functions (the names still could be better)
svn-id: r21981
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 1f32d4cea6..9a42dcb324 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -178,8 +178,8 @@ void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } } -#define INTERPOLATE INTERPOLATE<bitFormat> -#define Q_INTERPOLATE Q_INTERPOLATE<bitFormat> +#define interpolate32_1_1 interpolate32_1_1<bitFormat> +#define interpolate32_1_1_1_1 interpolate32_1_1_1_1<bitFormat> /** * Trivial nearest-neighbour 1.5x scaler. @@ -202,13 +202,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) = INTERPOLATE(color0, color1); + *(uint16 *)(r + 2) = interpolate32_1_1(color0, color1); *(uint16 *)(r + 4) = color1; - *(uint16 *)(r + 0 + dstPitch) = INTERPOLATE(color0, color2); - *(uint16 *)(r + 2 + dstPitch) = Q_INTERPOLATE(color0, color1, color2, color3); - *(uint16 *)(r + 4 + dstPitch) = INTERPOLATE(color1, color3); + *(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 + dstPitch2) = color2; - *(uint16 *)(r + 2 + dstPitch2) = INTERPOLATE(color2, color3); + *(uint16 *)(r + 2 + dstPitch2) = interpolate32_1_1(color2, color3); *(uint16 *)(r + 4 + dstPitch2) = color3; } srcPtr += srcPitch2; |