thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCALERS: Change 'bitformat' template params to 'colormasks';

Browse source 
get rid of some #defines

svn-id: r48187
This commit is contained in:
Max Horn 2010-03-08 10:29:35 +00:00
parent 28c6c600d4
commit d239d5c2f8
6 changed files with 51 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/scaler.cpp
View file

@ -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;