[Scummvm-cvs-logs] CVS: scummvm/sound wave.cpp,1.8.2.3,1.8.2.4
kirben
kirben at users.sourceforge.net
Thu Jan 26 16:13:05 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound wave.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm floodfill_he.cpp,2.4,2.5 resource.cpp,1.357,1.358 script_v100he.cpp,2.189,2.190 script_v7he.cpp,2.178,2.179 scumm.h,1.674,1.675 wiz_he.cpp,2.108,2.109 wiz_he.h,2.37,2.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17218/sound
Modified Files:
Tag: branch-0-8-0
wave.cpp
Log Message:
Fix memory leak, if called directly.
Index: wave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/wave.cpp,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- wave.cpp 18 Jan 2006 18:07:37 -0000 1.8.2.3
+++ wave.cpp 27 Jan 2006 00:12:29 -0000 1.8.2.4
@@ -110,7 +110,7 @@
// Prepare the return values.
rate = samplesPerSec;
- flags = 0;
+ flags = Audio::Mixer::FLAG_AUTOFREE;
if (bitsPerSample == 8) // 8 bit data is unsigned
flags |= Audio::Mixer::FLAG_UNSIGNED;
else if (bitsPerSample == 16) // 16 bit data is signed little endian
@@ -169,7 +169,6 @@
byte *data = (byte *)malloc(size);
assert(data);
stream.read(data, size);
- flags |= Audio::Mixer::FLAG_AUTOFREE;
return makeLinearInputStream(rate, flags, data, size, 0, 0);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound wave.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm floodfill_he.cpp,2.4,2.5 resource.cpp,1.357,1.358 script_v100he.cpp,2.189,2.190 script_v7he.cpp,2.178,2.179 scumm.h,1.674,1.675 wiz_he.cpp,2.108,2.109 wiz_he.h,2.37,2.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list