Mercurial > hg > svcore
comparison data/fft/FFTFileCacheReader.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 MatrixFile::ReadOnly, | 42 MatrixFile::ReadOnly, |
43 m_storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float), | 43 m_storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float), |
44 writer->getWidth(), | 44 writer->getWidth(), |
45 writer->getHeight() * 2 + m_factorSize)) | 45 writer->getHeight() * 2 + m_factorSize)) |
46 { | 46 { |
47 // std::cerr << "FFTFileCacheReader: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << std::endl; | 47 // cerr << "FFTFileCacheReader: storage type is " << (storageType == FFTCache::Compact ? "Compact" : storageType == Polar ? "Polar" : "Rectangular") << endl; |
48 } | 48 } |
49 | 49 |
50 FFTFileCacheReader::~FFTFileCacheReader() | 50 FFTFileCacheReader::~FFTFileCacheReader() |
51 { | 51 { |
52 if (m_readbuf) delete[] m_readbuf; | 52 if (m_readbuf) delete[] m_readbuf; |
265 } else { | 265 } else { |
266 m_readbufWidth = 1; | 266 m_readbufWidth = 1; |
267 } | 267 } |
268 m_readbufGood = good; | 268 m_readbufGood = good; |
269 } catch (FileReadFailed f) { | 269 } catch (FileReadFailed f) { |
270 std::cerr << "ERROR: FFTFileCacheReader::populateReadBuf: File read failed: " | 270 cerr << "ERROR: FFTFileCacheReader::populateReadBuf: File read failed: " |
271 << f.what() << std::endl; | 271 << f.what() << endl; |
272 memset(m_readbuf, 0, m_mfc->getHeight() * 2 * m_mfc->getCellSize()); | 272 memset(m_readbuf, 0, m_mfc->getHeight() * 2 * m_mfc->getCellSize()); |
273 } | 273 } |
274 m_readbufCol = x; | 274 m_readbufCol = x; |
275 } | 275 } |
276 | 276 |