Mercurial > hg > svcore

diff data/fileio/FFTFuzzyAdapter.cpp @ 935:f960d67ce842 tonioni

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:42:01 +0100
parents 59e7fe1b1003
children
line wrap: on
line diff
--- a/data/fileio/FFTFuzzyAdapter.cpp	Mon Jun 16 11:28:45 2014 +0100
+++ b/data/fileio/FFTFuzzyAdapter.cpp	Wed Jun 18 13:42:01 2014 +0100
@@ -20,11 +20,11 @@
 FFTFuzzyAdapter::FFTFuzzyAdapter(const DenseTimeValueModel *model,
 				 int channel,
 				 WindowType windowType,
-				 size_t windowSize,
-				 size_t windowIncrement,
-				 size_t fftSize,
+				 int windowSize,
+				 int windowIncrement,
+				 int fftSize,
 				 bool polar,
-				 size_t fillFromColumn) :
+				 int fillFromColumn) :
     m_server(0),
     m_xshift(0),
     m_yshift(0)
@@ -38,8 +38,8 @@
                                                polar,
                                                fillFromColumn);
 
-    size_t xratio = windowIncrement / m_server->getWindowIncrement();
-    size_t yratio = m_server->getFFTSize() / fftSize;
+    int xratio = windowIncrement / m_server->getWindowIncrement();
+    int yratio = m_server->getFFTSize() / fftSize;
 
     while (xratio > 1) {
         if (xratio & 0x1) {