[Scummvm-cvs-logs] scummvm master -> 98cfb57dd3602e96248e0fae47a8e9250dad7a08
lordhoto
lordhoto at gmail.com
Sun Jan 6 20:35:20 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
98cfb57dd3 PARALLACTION: Fix a const cast warning.
Commit: 98cfb57dd3602e96248e0fae47a8e9250dad7a08
https://github.com/scummvm/scummvm/commit/98cfb57dd3602e96248e0fae47a8e9250dad7a08
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-06T11:34:26-08:00
Commit Message:
PARALLACTION: Fix a const cast warning.
Changed paths:
engines/parallaction/disk_br.cpp
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index efddfb9..3135c3e 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -728,7 +728,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) {
max = 72;
byte *data = new byte[max * 2601];
- byte *srcPtr = (byte *)decoder.getSurface()->getBasePtr(0,0);
+ const byte *srcPtr = (const byte *)decoder.getSurface()->getBasePtr(0,0);
int w = decoder.getSurface()->w;
// Convert to the expected display format
@@ -736,7 +736,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) {
uint16 x = (i % 8) * 51;
uint16 y = (i / 8) * 51;
- byte *src = srcPtr + y * w + x;
+ const byte *src = srcPtr + y * w + x;
byte *dst = data + i * 2601;
for (int h = 0; h < 51; h++) {
memcpy(dst, src, 51);
More information about the Scummvm-git-logs
mailing list