diff options
| author | Max Horn | 2010-03-08 10:29:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-08 10:29:35 +0000 |
| commit | d239d5c2f82c1e2dea09ed27475ec136a7ea3b5f (patch) | |
| tree | febd0bbd175c1268c17cff46830095a4d9ee3547 /graphics/scaler/2xsai.cpp | |
| parent | 28c6c600d45b4ce16f13d08cfc7c9fbcc8461a63 (diff) | |
| download | scummvm-rg350-d239d5c2f82c1e2dea09ed27475ec136a7ea3b5f.tar.gz scummvm-rg350-d239d5c2f82c1e2dea09ed27475ec136a7ea3b5f.tar.bz2 scummvm-rg350-d239d5c2f82c1e2dea09ed27475ec136a7ea3b5f.zip | |
SCALERS: Change 'bitformat' template params to 'colormasks';
get rid of some #defines
svn-id: r48187
Diffstat (limited to 'graphics/scaler/2xsai.cpp')
| -rw-r--r-- | graphics/scaler/2xsai.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/scaler/2xsai.cpp b/graphics/scaler/2xsai.cpp index 64c989c629..165734ba10 100644 --- a/graphics/scaler/2xsai.cpp +++ b/graphics/scaler/2xsai.cpp @@ -41,12 +41,12 @@ static inline int GetResult(uint32 A, uint32 B, uint32 C, uint32 D) { return (y>>1) - (x>>1); } -#define interpolate_1_1 interpolate16_1_1<Graphics::ColorMasks<bitFormat> > -#define interpolate_3_1 interpolate16_3_1<Graphics::ColorMasks<bitFormat> > -#define interpolate_6_1_1 interpolate16_6_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_3_1 interpolate16_3_1<ColorMask> +#define interpolate_6_1_1 interpolate16_6_1_1<ColorMask> +#define interpolate_1_1_1_1 interpolate16_1_1_1_1<ColorMask> -template<int bitFormat> +template<typename ColorMask> void Super2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; @@ -155,7 +155,7 @@ void Super2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin MAKE_WRAPPER(Super2xSaI) -template<int bitFormat> +template<typename ColorMask> void SuperEagleTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; @@ -260,7 +260,7 @@ void SuperEagleTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin MAKE_WRAPPER(SuperEagle) -template<int bitFormat> +template<typename ColorMask> void _2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; |