[Scummvm-cvs-logs] CVS: residual smush.cpp,1.45,1.46 vima.cpp,1.6,1.7
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Dec 11 12:27:01 CET 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17741
Modified Files:
smush.cpp vima.cpp
Log Message:
fixed endianes on BE systems
Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- smush.cpp 10 Dec 2004 21:35:17 -0000 1.45
+++ smush.cpp 11 Dec 2004 20:26:24 -0000 1.46
@@ -109,7 +109,10 @@
int16 *dst = new int16[size * _channels];
decompressVima((char *)src, dst, size * _channels * 2, destTable);
- int flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN | SoundMixer::FLAG_AUTOFREE;
+ int flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+ flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+#endif
if (_channels == 2)
flags |= SoundMixer::FLAG_STEREO;
Index: vima.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/vima.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vima.cpp 10 Dec 2004 21:35:17 -0000 1.6
+++ vima.cpp 11 Dec 2004 20:26:24 -0000 1.7
@@ -178,7 +178,7 @@
outputWord = 0x7fff;
}
- WRITE_LE_UINT16(destPos, outputWord);
+ *destPos = outputWord;
destPos += numChannels;
currTablePos += offsets[numBits - 2][val];
More information about the Scummvm-git-logs
mailing list