# HG changeset patch # User Chris Cannam # Date 1465998231 -3600 # Node ID 861f40fc9958a2bd109d5dc475bf58cf600f3941 # Parent 5eb4d79334b9c91a6e4ed3e0bdf3fb93de8180fc Don't need these diff -r 5eb4d79334b9 -r 861f40fc9958 layer/SpectrogramLayer.cpp --- a/layer/SpectrogramLayer.cpp Wed Jun 15 09:46:20 2016 +0100 +++ b/layer/SpectrogramLayer.cpp Wed Jun 15 14:43:51 2016 +0100 @@ -2367,7 +2367,7 @@ fft->getMagnitudesAt(sx, values.data(), minbin, bincount); } - return move(values); + return values; } vector @@ -2382,8 +2382,8 @@ auto col = model->getColumn(sx); - return move(vector(col.data() + minbin, - col.data() + minbin + bincount)); + return vector(col.data() + minbin, + col.data() + minbin + bincount); } vector @@ -2399,7 +2399,7 @@ for (auto v: in) { out.push_back(v * scale); } - return move(out); + return out; } static bool @@ -2523,13 +2523,13 @@ for (auto v: in) { out.push_back(v * scale); } - return move(out); + return out; } vector SpectrogramLayer::peakPickColumn(const vector &in) const { - if (m_binDisplay != PeakBins) return in; + if (m_binDisplay == AllBins) return in; vector out(in.size(), 0.f); @@ -2539,7 +2539,7 @@ } } - return move(out); + return out; } vector @@ -2552,7 +2552,7 @@ for (auto v: in) { out.push_back(v * m_gain); } - return move(out); + return out; } // order: