diff options
| author | Max Horn | 2009-10-09 21:47:33 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-09 21:47:33 +0000 |
| commit | 2e964baeef9a74d45090583b52419afa3c9c47bf (patch) | |
| tree | 66106bd63ae8f9d7a1120d57344987856c961b56 /graphics/conversion.cpp | |
| parent | 6f1c43a7311d5e942f055087e307d6a537e159c6 (diff) | |
| download | scummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.tar.gz scummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.tar.bz2 scummvm-rg350-2e964baeef9a74d45090583b52419afa3c9c47bf.zip | |
Some const correctness changes; cleanup
svn-id: r44850
Diffstat (limited to 'graphics/conversion.cpp')
| -rw-r--r-- | graphics/conversion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp index b51ead1897..f262a60ef1 100644 --- a/graphics/conversion.cpp +++ b/graphics/conversion.cpp @@ -65,10 +65,10 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, uint16 color; for (int y = 0; y < h; y++) { for (int x = 0; x < w; x++, src += 2, dst += 2) { - color = *(uint16 *) src; + color = *(const uint16 *)src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); - *(uint16 *) dst = color; + *(uint16 *)dst = color; } src += srcDelta; dst += dstDelta; @@ -82,7 +82,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, if (srcFmt.bytesPerPixel == 2) { for (int y = 0; y < h; y++) { for (int x = 0; x < w; x++, src += 2, dst += 3) { - color = *(uint16 *) src; + color = *(const uint16 *)src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); memcpy(dst, col, 3); @@ -110,7 +110,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, color = *(uint16 *) src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); - *(uint32 *) dst = color; + *(uint32 *)dst = color; } src += srcDelta; dst += dstDelta; @@ -125,7 +125,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, memcpy(col, src, 3); srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); - *(uint32 *) dst = color; + *(uint32 *)dst = color; } src += srcDelta; dst += dstDelta; @@ -136,7 +136,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, color = *(uint32 *) src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); - *(uint32 *) dst = color; + *(uint32 *)dst = color; } src += srcDelta; dst += dstDelta; |