diff options
| author | Max Horn | 2010-03-08 10:31:42 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-08 10:31:42 +0000 |
| commit | 2cdf8996f3394e3bde74eba404bdde121b41abe7 (patch) | |
| tree | 57f380925b547ee4590a45bb051cee1d014a5dff /graphics/scaler.cpp | |
| parent | 0fc137cdf2f04d676b196efb6bc0599efd53e84f (diff) | |
| download | scummvm-rg350-2cdf8996f3394e3bde74eba404bdde121b41abe7.tar.gz scummvm-rg350-2cdf8996f3394e3bde74eba404bdde121b41abe7.tar.bz2 scummvm-rg350-2cdf8996f3394e3bde74eba404bdde121b41abe7.zip | |
Rename PocketPCLandscapeAspect to Normal1xAspect and move it to
graphics/scaler/aspect.cpp
svn-id: r48192
Diffstat (limited to 'graphics/scaler.cpp')
| -rw-r--r-- | graphics/scaler.cpp | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 65e32cd2c2..a1439d3165 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -178,45 +178,9 @@ void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit } #ifndef DISABLE_SCALERS -#ifdef USE_ARM_SCALER_ASM -extern "C" void Normal2xAspectMask(const uint8 *srcPtr, - uint32 srcPitch, - uint8 *dstPtr, - uint32 dstPitch, - int width, - int height, - uint32 mask); -/** - * A 2x scaler which also does aspect ratio correction. - * This is Normal2x combined with vertical stretching, - * so it will scale a 320x200 surface to a 640x480 surface. - */ -void Normal2xAspect(const uint8 *srcPtr, - uint32 srcPitch, - uint8 *dstPtr, - uint32 dstPitch, - int width, - int height) { - if (gBitFormat == 565) { - Normal2xAspectMask(srcPtr, - srcPitch, - dstPtr, - dstPitch, - width, - height, - 0x07e0F81F); - } else { - Normal2xAspectMask(srcPtr, - srcPitch, - dstPtr, - dstPitch, - width, - height, - 0x03e07C1F); - } -} +#ifdef USE_ARM_SCALER_ASM extern "C" void Normal2xARM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, @@ -422,4 +386,4 @@ void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi } } -#endif +#endif // #ifndef DISABLE_SCALERS |