Mercurial > hg > svcore

comparison data/fileio/FFTFuzzyAdapter.cpp @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
18 #include <cassert> 18 #include <cassert>
19 19
20 FFTFuzzyAdapter::FFTFuzzyAdapter(const DenseTimeValueModel *model, 20 FFTFuzzyAdapter::FFTFuzzyAdapter(const DenseTimeValueModel *model,
21 int channel, 21 int channel,
22 WindowType windowType, 22 WindowType windowType,
23 size_t windowSize, 23 int windowSize,
24 size_t windowIncrement, 24 int windowIncrement,
25 size_t fftSize, 25 int fftSize,
26 bool polar, 26 bool polar,
27 size_t fillFromColumn) : 27 int fillFromColumn) :
28 m_server(0), 28 m_server(0),
29 m_xshift(0), 29 m_xshift(0),
30 m_yshift(0) 30 m_yshift(0)
31 { 31 {
32 m_server = FFTDataServer::getFuzzyInstance(model, 32 m_server = FFTDataServer::getFuzzyInstance(model,
36 windowIncrement, 36 windowIncrement,
37 fftSize, 37 fftSize,
38 polar, 38 polar,
39 fillFromColumn); 39 fillFromColumn);
40 40
41 size_t xratio = windowIncrement / m_server->getWindowIncrement(); 41 int xratio = windowIncrement / m_server->getWindowIncrement();
42 size_t yratio = m_server->getFFTSize() / fftSize; 42 int yratio = m_server->getFFTSize() / fftSize;
43 43
44 while (xratio > 1) { 44 while (xratio > 1) {
45 if (xratio & 0x1) { 45 if (xratio & 0x1) {
46 cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio " 46 cerr << "ERROR: FFTFuzzyAdapter: Window increment ratio "
47 << windowIncrement << " / " 47 << windowIncrement << " / "