diff options
| author | Matthew Hoops | 2012-04-19 08:16:08 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-04-19 08:16:24 -0400 |
| commit | 9971e74c4c481f99401212b469e9c79185fa6e70 (patch) | |
| tree | c45fe6d57cc35557e3c7ceb90b1e6f3edeb3aa2f /common/dct.cpp | |
| parent | 5ee569bce634d6704703239e665d865afc4e48fb (diff) | |
| parent | 4520b115e97b494bd5d13599f27a5a339465f88e (diff) | |
| download | scummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.tar.gz scummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.tar.bz2 scummvm-rg350-9971e74c4c481f99401212b469e9c79185fa6e70.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
base/plugins.cpp
configure
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]; |