diff options
| author | Johannes Schickel | 2012-07-14 05:40:09 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-08-28 02:27:48 +0200 |
| commit | e8cf0adf95217d4eedec526df960a8cdd46cc28f (patch) | |
| tree | ee35cc84394ff7912004639ff2fab82832aa99a1 /graphics/conversion.cpp | |
| parent | a92a509ac844fdad796748848d1143b27547173f (diff) | |
| download | scummvm-rg350-e8cf0adf95217d4eedec526df960a8cdd46cc28f.tar.gz scummvm-rg350-e8cf0adf95217d4eedec526df960a8cdd46cc28f.tar.bz2 scummvm-rg350-e8cf0adf95217d4eedec526df960a8cdd46cc28f.zip | |
GRAPHICS: Slight cleanup in crossBlit code.
Diffstat (limited to 'graphics/conversion.cpp')
| -rw-r--r-- | graphics/conversion.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp index 27a44f4ed5..fec1d240e2 100644 --- a/graphics/conversion.cpp +++ b/graphics/conversion.cpp @@ -36,11 +36,10 @@ FORCEINLINE void crossBlitLogic(byte *dst, const byte *src, const uint w, const const uint srcDelta, const uint dstDelta) { for (uint y = 0; y < h; ++y) { for (uint x = 0; x < w; ++x) { - uint32 color = *(const SrcColor *)src; + const uint32 color = *(const SrcColor *)src; byte a, r, g, b; srcFmt.colorToARGB(color, a, r, g, b); - color = dstFmt.ARGBToColor(a, r, g, b); - *(DstColor *)dst = color; + *(DstColor *)dst = dstFmt.ARGBToColor(a, r, g, b); if (backward) { src -= sizeof(SrcColor); @@ -75,8 +74,7 @@ FORCEINLINE void crossBlitLogic3BppSource(byte *dst, const byte *src, const uint for (uint x = 0; x < w; ++x) { memcpy(col, src, 3); srcFmt.colorToARGB(color, a, r, g, b); - color = dstFmt.ARGBToColor(a, r, g, b); - *(DstColor *)dst = color; + *(DstColor *)dst = dstFmt.ARGBToColor(a, r, g, b); if (backward) { src -= 3; |