diff options
-rw-r--r-- | graphics/scaler/downscaler.cpp | 71 | ||||
-rw-r--r-- | graphics/scaler/downscaler.h | 12 |
2 files changed, 0 insertions, 83 deletions
diff --git a/graphics/scaler/downscaler.cpp b/graphics/scaler/downscaler.cpp index 3f4f81a228..35c4389c28 100644 --- a/graphics/scaler/downscaler.cpp +++ b/graphics/scaler/downscaler.cpp @@ -72,74 +72,3 @@ void DownscaleAllByHalf(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin } #endif - - -/** - * This filter (down)scales the source image horizontally by a factor of 1/2. - * For example, a 320x200 image is scaled to 160x200. - */ -template<typename ColorMask> -void DownscaleHorizByHalfTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { - uint16 *work; - - // Various casts below go via (void *) to avoid warning. This is - // safe as these are all even addresses. - while (height--) { - work = (uint16 *)(void *)dstPtr; - - for (int i = 0; i < width; i += 2) { - uint16 color1 = *(((const uint16 *)(const void *)srcPtr) + i); - uint16 color2 = *(((const uint16 *)(const void *)srcPtr) + (i + 1)); - *work++ = interpolate32_1_1<ColorMask>(color1, color2); - } - srcPtr += srcPitch; - dstPtr += dstPitch; - } -} - -void DownscaleHorizByHalf(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { - extern int gBitFormat; - if (gBitFormat == 565) - DownscaleHorizByHalfTemplate<Graphics::ColorMasks<565> >(srcPtr, srcPitch, dstPtr, dstPitch, width, height); - else - DownscaleHorizByHalfTemplate<Graphics::ColorMasks<555> >(srcPtr, srcPitch, dstPtr, dstPitch, width, height); -} - -/** - * This filter (down)scales the source image horizontally by a factor of 3/4. - * For example, a 320x200 image is scaled to 240x200. - */ -template<typename ColorMask> -void DownscaleHorizByThreeQuartersTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { - uint16 *work; - - // Various casts below go via (void *) to avoid warning. This is - // safe as these are all even addresses. - while (height--) { - work = (uint16 *)(void *)dstPtr; - - for (int i = 0; i < width; i += 4) { - // Work with 4 pixels - uint16 color1 = *(((const uint16 *)(const void *)srcPtr) + i); - uint16 color2 = *(((const uint16 *)(const void *)srcPtr) + (i + 1)); - uint16 color3 = *(((const uint16 *)(const void *)srcPtr) + (i + 2)); - uint16 color4 = *(((const uint16 *)(const void *)srcPtr) + (i + 3)); - - work[0] = interpolate32_3_1<ColorMask>(color1, color2); - work[1] = interpolate32_1_1<ColorMask>(color2, color3); - work[2] = interpolate32_3_1<ColorMask>(color4, color3); - - work += 3; - } - srcPtr += srcPitch; - dstPtr += dstPitch; - } -} - -void DownscaleHorizByThreeQuarters(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { - extern int gBitFormat; - if (gBitFormat == 565) - DownscaleHorizByThreeQuartersTemplate<Graphics::ColorMasks<565> >(srcPtr, srcPitch, dstPtr, dstPitch, width, height); - else - DownscaleHorizByThreeQuartersTemplate<Graphics::ColorMasks<555> >(srcPtr, srcPitch, dstPtr, dstPitch, width, height); -} diff --git a/graphics/scaler/downscaler.h b/graphics/scaler/downscaler.h index ca1137e78b..286879915a 100644 --- a/graphics/scaler/downscaler.h +++ b/graphics/scaler/downscaler.h @@ -32,16 +32,4 @@ */ DECLARE_SCALER(DownscaleAllByHalf); -/** - * This filter (down)scales the source image horizontally by a factor of 1/2. - * For example, a 320x200 image is scaled to 160x200. - */ -DECLARE_SCALER(DownscaleHorizByHalf); - -/** - * This filter (down)scales the source image horizontally by a factor of 3/4. - * For example, a 320x200 image is scaled to 240x200. - */ -DECLARE_SCALER(DownscaleHorizByThreeQuarters); - #endif |