Mercurial > hg > svgui
diff widgets/PluginParameterDialog.cpp @ 922:26da827e8fb5 tonioni
Merge from cxx11 branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 11:26:28 +0000 |
parents | 4a578a360011 |
children | a34a2a25907c |
line wrap: on
line diff
--- a/widgets/PluginParameterDialog.cpp Mon Mar 23 10:04:51 2015 +0000 +++ b/widgets/PluginParameterDialog.cpp Mon Mar 23 11:26:28 2015 +0000 @@ -386,10 +386,10 @@ int size = 1024; int increment = 1024; if (fePlugin) { - size = fePlugin->getPreferredBlockSize(); + size = int(fePlugin->getPreferredBlockSize()); cerr << "Feature extraction plugin \"" << fePlugin->getName() << "\" reports preferred block size as " << size << endl; if (size == 0) size = 1024; - increment = fePlugin->getPreferredStepSize(); + increment = int(fePlugin->getPreferredStepSize()); if (increment == 0) { if (fePlugin->getInputDomain() == Vamp::Plugin::TimeDomain) { increment = size;