blob: 224b7106718d2d18343d11b479b203699c6a6853 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Fixes for 64bit issues from upstream.
http://bugs.gentoo.org/103450
--- scummvm/scummvm/common/scaler.cpp
+++ scummvm/scummvm/common/scaler.cpp
@@ -123,7 +123,7 @@
int width, int height) {
uint8 *r;
- assert(((int)dstPtr & 3) == 0);
+ assert(((long)dstPtr & 3) == 0);
while (height--) {
r = dstPtr;
for (int i = 0; i < width; ++i, r += 4) {
@@ -148,7 +148,7 @@
const uint32 dstPitch2 = dstPitch * 2;
const uint32 dstPitch3 = dstPitch * 3;
- assert(((int)dstPtr & 1) == 0);
+ assert(((long)dstPtr & 1) == 0);
while (height--) {
r = dstPtr;
for (int i = 0; i < width; ++i, r += 6) {
--- scummvm/scummvm/scumm/instrument.h
+++ scummvm/scummvm/scumm/instrument.h
@@ -60,7 +60,7 @@
void clear();
void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
- operator int() { return (_instrument ? (int) _instrument : 255); }
+ operator int() { return (_instrument ? (long) _instrument : 255); }
void program (byte program, bool mt32);
void adlib (byte *instrument);
void roland (byte *instrument);
|
GitWeb
