Mercurial > hg > svcore
diff data/fft/FFTFileCacheWriter.cpp @ 847:2d53205f70cd tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 26 Nov 2013 14:37:01 +0000 |
| parents | e802e550a1f2 |
| children | 59e7fe1b1003 |
line wrap: on
line diff
--- a/data/fft/FFTFileCacheWriter.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fft/FFTFileCacheWriter.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -44,7 +44,7 @@ width, height * 2 + m_factorSize)) { #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << std::endl; + cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << endl; #endif m_mfc->setAutoClose(true); m_writebuf = new char[(height * 2 + m_factorSize) * m_mfc->getCellSize()]; @@ -114,7 +114,7 @@ static float maxFactor = 0; if (factor > maxFactor) maxFactor = factor; #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; + cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; #endif setNormalizationFactorToWritebuf(factor); @@ -167,7 +167,7 @@ static float maxFactor = 0; if (factor > maxFactor) maxFactor = factor; #ifdef DEBUG_FFT_FILE_CACHE_WRITER - std::cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; + cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; #endif setNormalizationFactorToWritebuf(factor);