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/thumbnail_intern.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/thumbnail_intern.cpp')
| -rw-r--r-- | graphics/scaler/thumbnail_intern.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp index a7389e3d8d..fabe07b031 100644 --- a/graphics/scaler/thumbnail_intern.cpp +++ b/graphics/scaler/thumbnail_intern.cpp @@ -38,7 +38,7 @@ uint16 quadBlockInterpolate(const uint8* src, uint32 srcPitch) { uint16 colorx1y2 = *(((const uint16*)(src + srcPitch))); uint16 colorx2y2 = *(((const uint16*)(src + srcPitch)) + 1); - return interpolate32_1_1_1_1<bitFormat>(colorx1y1, colorx2y1, colorx1y2, colorx2y2); + return interpolate16_1_1_1_1<Graphics::ColorMasks<bitFormat> >(colorx1y1, colorx2y1, colorx1y2, colorx2y2); } template<int bitFormat> @@ -65,7 +65,7 @@ void createThumbnail_4(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 uint16 downleft = quadBlockInterpolate<bitFormat>(src + srcPitch * 2 + 2 * x, srcPitch); uint16 downright = quadBlockInterpolate<bitFormat>(src + srcPitch * 2 + 2 * (x + 2), srcPitch); - *((uint16*)dstPtr) = interpolate32_1_1_1_1<bitFormat>(upleft, upright, downleft, downright); + *((uint16*)dstPtr) = interpolate16_1_1_1_1<Graphics::ColorMasks<bitFormat> >(upleft, upright, downleft, downright); } dstPtr += (dstPitch - 2 * width / 4); src += 4 * srcPitch; |