diff options
| author | D G Turner | 2011-07-19 02:29:13 +0100 |
|---|---|---|
| committer | D G Turner | 2011-07-19 02:29:13 +0100 |
| commit | 54f25aa84373715001c56155673fb59cfe44b573 (patch) | |
| tree | 636cbbacffd6b5adfcf125917bbb70ed38503dea /audio/decoders | |
| parent | 1f3ccd4eed78c94da4856044d5351c1fccc53607 (diff) | |
| download | scummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.tar.gz scummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.tar.bz2 scummvm-rg350-54f25aa84373715001c56155673fb59cfe44b573.zip | |
COMMON: Renamed Integer Log2 function from log2 to intLog2.
This avoids naming collisions with system libraries on some platforms
i.e. DS, DC where the log2 is realised by macro.
Diffstat (limited to 'audio/decoders')
| -rw-r--r-- | audio/decoders/qdm2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp index 842ca58654..19b30217e9 100644 --- a/audio/decoders/qdm2.cpp +++ b/audio/decoders/qdm2.cpp @@ -1822,11 +1822,11 @@ QDM2Stream::QDM2Stream(Common::SeekableReadStream *extraData, DisposeAfterUse::F warning("QDM2Stream::QDM2Stream() u4 field not 0"); } - _fftOrder = log2(_frameSize) + 1; + _fftOrder = Common::intLog2(_frameSize) + 1; _fftFrameSize = 2 * _frameSize; // complex has two floats // something like max decodable tones - _groupOrder = log2(_blockSize) + 1; + _groupOrder = Common::intLog2(_blockSize) + 1; _sFrameSize = _blockSize / 16; // 16 iterations per super block _subSampling = _fftOrder - 7; |