diff options
author | Johannes Schickel | 2012-06-12 04:13:00 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-06-12 04:18:59 +0200 |
commit | 0075fa2f98eb3deb4674a4f1af95a84669098d7c (patch) | |
tree | a0971d7ab61a5da8a7008bdd60617f90654e1d8b /graphics/scaler.cpp | |
parent | ef8239df4877772762876ca1a98ad48676af8d5c (diff) | |
download | scummvm-rg350-0075fa2f98eb3deb4674a4f1af95a84669098d7c.tar.gz scummvm-rg350-0075fa2f98eb3deb4674a4f1af95a84669098d7c.tar.bz2 scummvm-rg350-0075fa2f98eb3deb4674a4f1af95a84669098d7c.zip |
GRAPHICS: Replace OverlayColor with uint16 in scaler code.
Scalers are actually fixed at 2Bpp right now and not at the
depth of OverlayColor.
Diffstat (limited to 'graphics/scaler.cpp')
-rw-r--r-- | graphics/scaler.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 9ade0e6c57..b81e8937a8 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -167,12 +167,12 @@ void DestroyScalers(){ void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { // Spot the case when it can all be done in 1 hit - if ((srcPitch == sizeof(OverlayColor) * (uint)width) && (dstPitch == sizeof(OverlayColor) * (uint)width)) { - memcpy(dstPtr, srcPtr, sizeof(OverlayColor) * width * height); + if ((srcPitch == sizeof(uint16) * (uint)width) && (dstPitch == sizeof(uint16) * (uint)width)) { + memcpy(dstPtr, srcPtr, sizeof(uint16) * width * height); return; } while (height--) { - memcpy(dstPtr, srcPtr, sizeof(OverlayColor) * width); + memcpy(dstPtr, srcPtr, sizeof(uint16) * width); srcPtr += srcPitch; dstPtr += dstPitch; } @@ -207,11 +207,10 @@ void Normal2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit uint8 *r; assert(IS_ALIGNED(dstPtr, 4)); - assert(sizeof(OverlayColor) == 2); while (height--) { r = dstPtr; for (int i = 0; i < width; ++i, r += 4) { - uint32 color = *(((const OverlayColor *)srcPtr) + i); + uint32 color = *(((const uint16 *)srcPtr) + i); color |= color << 16; |