diff options
| author | Johannes Schickel | 2009-07-27 17:04:06 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-07-27 17:04:06 +0000 |
| commit | d165f85a58d9d5df88e3d1faf14bd89118350391 (patch) | |
| tree | e8e335c1470b12fe3bde462a09e0fe2878149f56 /graphics | |
| parent | 816bd9a7ea4f99aaae67c6e82f686b88dd8c728f (diff) | |
| download | scummvm-rg350-d165f85a58d9d5df88e3d1faf14bd89118350391.tar.gz scummvm-rg350-d165f85a58d9d5df88e3d1faf14bd89118350391.tar.bz2 scummvm-rg350-d165f85a58d9d5df88e3d1faf14bd89118350391.zip | |
Formatting.
svn-id: r42844
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/scaler.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 7620e5b107..a3aaaa121d 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -189,22 +189,20 @@ 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); + uint32 srcPitch, + uint8 *dstPtr, + uint32 dstPitch, + int width, + int height, + uint32 mask); void Normal2xAspect(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, - int height) -{ - if (gBitFormat == 565) - { + int height) { + if (gBitFormat == 565) { Normal2xAspectMask(srcPtr, srcPitch, dstPtr, @@ -212,9 +210,7 @@ void Normal2xAspect(const uint8 *srcPtr, width, height, 0x07e0F81F); - } - else - { + } else { Normal2xAspectMask(srcPtr, srcPitch, dstPtr, @@ -229,18 +225,18 @@ extern "C" void Normal2xARM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, - int width, - int height); + int width, + int height); void Normal2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, - int width, - int height) -{ + int width, + int height) { Normal2xARM(srcPtr, srcPitch, dstPtr, dstPitch, width, height); } + #else /** * Trivial nearest-neighbour 2x scaler. |