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/rdft.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/rdft.cpp')
| -rw-r--r-- | common/rdft.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/common/rdft.cpp b/common/rdft.cpp index 3f52a89cba..bfd6818fbd 100644 --- a/common/rdft.cpp +++ b/common/rdft.cpp @@ -25,12 +25,10 @@ // Copyright (c) 2009 Alex Converse <alex dot converse at gmail dot com> #include "common/rdft.h" -#include "common/cosinetables.h" -#include "common/sinetables.h" namespace Common { -RDFT::RDFT(int bits, TransformType trans) : _bits(bits), _fft(0) { +RDFT::RDFT(int bits, TransformType trans) : _bits(bits), _sin(bits), _cos(bits), _fft(0) { assert ((_bits >= 4) && (_bits <= 16)); _inverse = trans == IDFT_C2R || trans == DFT_C2R; @@ -40,8 +38,8 @@ RDFT::RDFT(int bits, TransformType trans) : _bits(bits), _fft(0) { int n = 1 << bits; - _tSin = getSineTable(bits) + (trans == DFT_R2C || trans == DFT_C2R) * (n >> 2); - _tCos = getCosineTable(bits); + _tSin = _sin.getTable() + (trans == DFT_R2C || trans == DFT_C2R) * (n >> 2); + _tCos = _cos.getTable(); } RDFT::~RDFT() { |