diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /common/dct.cpp | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'common/dct.cpp')
| -rw-r--r-- | common/dct.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/dct.cpp b/common/dct.cpp index 6525c727ae..38b4fbcff2 100644 --- a/common/dct.cpp +++ b/common/dct.cpp @@ -26,15 +26,14 @@ // Copyright (c) 2010 Alex Converse <alex.converse@gmail.com> // Copyright (c) 2010 Vitor Sessak -#include "common/cosinetables.h" #include "common/dct.h" namespace Common { -DCT::DCT(int bits, TransformType trans) : _bits(bits), _trans(trans), _rdft(0) { +DCT::DCT(int bits, TransformType trans) : _bits(bits), _cos(_bits + 2), _trans(trans), _rdft(0) { int n = 1 << _bits; - _tCos = getCosineTable(_bits + 2); + _tCos = _cos.getTable(); _csc2 = new float[n / 2]; |