diff options
Diffstat (limited to 'graphics/scaler.cpp')
| -rw-r--r-- | graphics/scaler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 876be270ec..95606043b7 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -284,13 +284,13 @@ void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } } -#define interpolate_1_1 interpolate16_1_1<Graphics::ColorMasks<bitFormat> > -#define interpolate_1_1_1_1 interpolate16_1_1_1_1<Graphics::ColorMasks<bitFormat> > +#define interpolate_1_1 interpolate16_1_1<ColorMask> +#define interpolate_1_1_1_1 interpolate16_1_1_1_1<ColorMask> /** * Trivial nearest-neighbour 1.5x scaler. */ -template<int bitFormat> +template<typename ColorMask> void Normal1o5xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { uint8 *r; @@ -342,7 +342,7 @@ void AdvMame3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi scale(3, dstPtr, dstPitch, srcPtr - srcPitch, srcPitch, 2, width, height); } -template<int bitFormat> +template<typename ColorMask> void TV2xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint32 nextlineSrc = srcPitch / sizeof(uint16); @@ -356,8 +356,8 @@ void TV2xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 ds uint16 p1 = *(p + i); uint32 pi; - pi = (((p1 & redblueMask) * 7) >> 3) & redblueMask; - pi |= (((p1 & greenMask) * 7) >> 3) & greenMask; + pi = (((p1 & ColorMask::kRedBlueMask) * 7) >> 3) & ColorMask::kRedBlueMask; + pi |= (((p1 & ColorMask::kGreenMask) * 7) >> 3) & ColorMask::kGreenMask; *(q + j) = p1; *(q + j + 1) = p1; |