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/thumbnail.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/thumbnail.cpp')
| -rw-r--r-- | graphics/scaler/thumbnail.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/scaler/thumbnail.cpp b/graphics/scaler/thumbnail.cpp index 38e31c40fc..998cc11dbe 100644 --- a/graphics/scaler/thumbnail.cpp +++ b/graphics/scaler/thumbnail.cpp @@ -36,7 +36,7 @@ uint16 quadBlockInterpolate(const uint8* src, uint32 srcPitch) { uint16 colorx1y2 = *(((const uint16*)(src + srcPitch))); uint16 colorx2y2 = *(((const uint16*)(src + srcPitch)) + 1); - return Q_INTERPOLATE<bitFormat>(colorx1y1, colorx2y1, colorx1y2, colorx2y2); + return interpolate32_1_1_1_1<bitFormat>(colorx1y1, colorx2y1, colorx1y2, colorx2y2); } template<int bitFormat> @@ -63,7 +63,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) = Q_INTERPOLATE<bitFormat>(upleft, upright, downleft, downright); + *((uint16*)dstPtr) = interpolate32_1_1_1_1<bitFormat>(upleft, upright, downleft, downright); } dstPtr += (dstPitch - 2 * width / 4); src += 4 * srcPitch; |