Ticket #1878: p

File p, 1.8 KB (added by SF/toreanderson, 19 years ago)

Andreas' patch

Line 
1diff -urN ../tmp-orig/scummvm-0.7.0/configure ./configure
2--- ../tmp-orig/scummvm-0.7.0/configure 2004-12-16 15:57:15.000000000 +0100
3+++ ./configure 2005-01-07 09:35:00.569642600 +0100
4@@ -469,7 +469,7 @@
5 fi
6
7 case $cxx_version in
8- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
9+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.[0-9].[0-9])
10 _cxx_major=`echo $cxx_version | cut -d '.' -f 1`
11 _cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
12 cxx_version="$cxx_version, ok"
13diff -urN ../tmp-orig/scummvm-0.7.0/common/scaler.cpp ./common/scaler.cpp
14--- ../tmp-orig/scummvm-0.7.0/common/scaler.cpp 2004-08-10 19:46:04.000000000 +0200
15+++ ./common/scaler.cpp 2005-01-07 10:03:31.705510408 +0100
16@@ -123,7 +123,7 @@
17 int width, int height) {
18 uint8 *r;
19
20- assert(((int)dstPtr & 3) == 0);
21+ assert(((long)dstPtr & 3) == 0);
22 while (height--) {
23 r = dstPtr;
24 for (int i = 0; i < width; ++i, r += 4) {
25@@ -148,7 +148,7 @@
26 const uint32 dstPitch2 = dstPitch * 2;
27 const uint32 dstPitch3 = dstPitch * 3;
28
29- assert(((int)dstPtr & 1) == 0);
30+ assert(((long)dstPtr & 1) == 0);
31 while (height--) {
32 r = dstPtr;
33 for (int i = 0; i < width; ++i, r += 6) {
34diff -urN ../tmp-orig/scummvm-0.7.0/scumm/instrument.h ./scumm/instrument.h
35--- ../tmp-orig/scummvm-0.7.0/scumm/instrument.h 2004-01-06 13:45:30.000000000 +0100
36+++ ./scumm/instrument.h 2005-01-07 09:49:42.932503056 +0100
37@@ -60,7 +60,7 @@
38
39 void clear();
40 void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
41- operator int() { return (_instrument ? (int) _instrument : 255); }
42+ operator long() { return (_instrument ? (long) _instrument : 255); }
43 void program (byte program, bool mt32);
44 void adlib (byte *instrument);
45 void roland (byte *instrument);
46
47
48