Mercurial > hg > svcore
comparison 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 |
comparison
equal
deleted
inserted
replaced
841:226733f3cf3f | 847:2d53205f70cd |
---|---|
42 (fileBase, MatrixFile::WriteOnly, | 42 (fileBase, MatrixFile::WriteOnly, |
43 storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float), | 43 storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float), |
44 width, height * 2 + m_factorSize)) | 44 width, height * 2 + m_factorSize)) |
45 { | 45 { |
46 #ifdef DEBUG_FFT_FILE_CACHE_WRITER | 46 #ifdef DEBUG_FFT_FILE_CACHE_WRITER |
47 std::cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << std::endl; | 47 cerr << "FFTFileCacheWriter: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == FFTCache::Polar ? "Polar" : "Rectangular") << ", size " << width << "x" << height << endl; |
48 #endif | 48 #endif |
49 m_mfc->setAutoClose(true); | 49 m_mfc->setAutoClose(true); |
50 m_writebuf = new char[(height * 2 + m_factorSize) * m_mfc->getCellSize()]; | 50 m_writebuf = new char[(height * 2 + m_factorSize) * m_mfc->getCellSize()]; |
51 } | 51 } |
52 | 52 |
112 } | 112 } |
113 | 113 |
114 static float maxFactor = 0; | 114 static float maxFactor = 0; |
115 if (factor > maxFactor) maxFactor = factor; | 115 if (factor > maxFactor) maxFactor = factor; |
116 #ifdef DEBUG_FFT_FILE_CACHE_WRITER | 116 #ifdef DEBUG_FFT_FILE_CACHE_WRITER |
117 std::cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; | 117 cerr << "Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; |
118 #endif | 118 #endif |
119 | 119 |
120 setNormalizationFactorToWritebuf(factor); | 120 setNormalizationFactorToWritebuf(factor); |
121 | 121 |
122 m_mfc->setColumnAt(x, m_writebuf); | 122 m_mfc->setColumnAt(x, m_writebuf); |
165 } | 165 } |
166 | 166 |
167 static float maxFactor = 0; | 167 static float maxFactor = 0; |
168 if (factor > maxFactor) maxFactor = factor; | 168 if (factor > maxFactor) maxFactor = factor; |
169 #ifdef DEBUG_FFT_FILE_CACHE_WRITER | 169 #ifdef DEBUG_FFT_FILE_CACHE_WRITER |
170 std::cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << std::endl; | 170 cerr << "[RI] Column " << x << ": normalization factor: " << factor << ", max " << maxFactor << " (height " << getHeight() << ")" << endl; |
171 #endif | 171 #endif |
172 | 172 |
173 setNormalizationFactorToWritebuf(factor); | 173 setNormalizationFactorToWritebuf(factor); |
174 | 174 |
175 m_mfc->setColumnAt(x, m_writebuf); | 175 m_mfc->setColumnAt(x, m_writebuf); |