aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMax Horn2010-04-17 23:19:52 +0000
committerMax Horn2010-04-17 23:19:52 +0000
commitbb26c040530f4ea212e17716702963a88165a3b0 (patch)
tree815b162100e9178b7f27a2f836bc019b4ce1ce02 /graphics
parentaaa6e7ee541fc8d149ffc536e9ff6a015b40d179 (diff)
downloadscummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.gz
scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.bz2
scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.zip
Fixing some warnings (with gcc 3.3.6)
svn-id: r48694
Diffstat (limited to 'graphics')
-rw-r--r--graphics/conversion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp
index 1fd10a65dc..fee4b05f66 100644
--- a/graphics/conversion.cpp
+++ b/graphics/conversion.cpp
@@ -107,7 +107,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 += 4) {
- color = *(uint16 *) src;
+ color = *(const uint16 *)src;
srcFmt.colorToARGB(color, a, r, g, b);
color = dstFmt.ARGBToColor(a, r, g, b);
*(uint32 *)dst = color;
@@ -133,7 +133,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch,
} else {
for (int y = 0; y < h; y++) {
for (int x = 0; x < w; x++, src += 4, dst += 4) {
- color = *(uint32 *) src;
+ color = *(const uint32 *)src;
srcFmt.colorToARGB(color, a, r, g, b);
color = dstFmt.ARGBToColor(a, r, g, b);
*(uint32 *)dst = color;