[Scummvm-cvs-logs] CVS: tools compress_san.cpp,1.30,1.31
Pawel Kolodziejski
aquadran at users.sourceforge.net
Fri Jan 21 13:10:05 CET 2005
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25103
Modified Files:
compress_san.cpp
Log Message:
cleanup last change
Index: compress_san.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_san.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- compress_san.cpp 21 Jan 2005 21:05:42 -0000 1.30
+++ compress_san.cpp 21 Jan 2005 21:09:20 -0000 1.31
@@ -433,16 +433,16 @@
}
for (r = 0; r < length; r += 4) {
- int16 wavSampleL = READ_LE_UINT16((int16 *)(wavBuf + offset + r + 0));
- int16 wavSampleR = READ_LE_UINT16((int16 *)(wavBuf + offset + r + 2));
- int32 tmpSampleL = READ_LE_UINT16((int16 *)(tmpBuf + offset + r + 0));
- int32 tmpSampleR = READ_LE_UINT16((int16 *)(tmpBuf + offset + r + 2));
+ int16 wavSampleL = READ_LE_UINT16(wavBuf + offset + r + 0);
+ int16 wavSampleR = READ_LE_UINT16(wavBuf + offset + r + 2);
+ int32 tmpSampleL = READ_LE_UINT16(tmpBuf + offset + r + 0);
+ int32 tmpSampleR = READ_LE_UINT16(tmpBuf + offset + r + 2);
tmpSampleL = (tmpSampleL * volume) / 255;
tmpSampleR = (tmpSampleR * volume) / 255;
clampedAdd(wavSampleL, tmpSampleL);
clampedAdd(wavSampleR, tmpSampleR);
- WRITE_LE_UINT16((wavBuf + offset + r + 0), wavSampleL);
- WRITE_LE_UINT16((wavBuf + offset + r + 2), wavSampleR);
+ WRITE_LE_UINT16(wavBuf + offset + r + 0, wavSampleL);
+ WRITE_LE_UINT16(wavBuf + offset + r + 2, wavSampleR);
}
offset += length;
}
More information about the Scummvm-git-logs
mailing list