Mercurial > hg > svcore
diff data/fft/FFTFileCacheReader.cpp @ 1038:cc27f35aa75c cxx11
Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author | Chris Cannam |
---|---|
date | Tue, 03 Mar 2015 15:18:24 +0000 |
parents | 59e7fe1b1003 |
children | 027d8b943be5 |
line wrap: on
line diff
--- a/data/fft/FFTFileCacheReader.cpp Tue Mar 03 09:33:59 2015 +0000 +++ b/data/fft/FFTFileCacheReader.cpp Tue Mar 03 15:18:24 2015 +0000 @@ -40,7 +40,7 @@ m_mfc(new MatrixFile (writer->getFileBase(), MatrixFile::ReadOnly, - m_storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float), + int((m_storageType == FFTCache::Compact) ? sizeof(uint16_t) : sizeof(float)), writer->getWidth(), writer->getHeight() * 2 + m_factorSize)) { @@ -77,7 +77,7 @@ switch (m_storageType) { case FFTCache::Compact: - value = (getFromReadBufCompactUnsigned(x, y * 2) / 65535.0) + value = (getFromReadBufCompactUnsigned(x, y * 2) / 65535.f) * getNormalizationFactor(x); break; @@ -105,7 +105,7 @@ switch (m_storageType) { case FFTCache::Compact: - value = getFromReadBufCompactUnsigned(x, y * 2) / 65535.0; + value = getFromReadBufCompactUnsigned(x, y * 2) / 65535.f; break; case FFTCache::Rectangular: @@ -136,7 +136,7 @@ switch (m_storageType) { case FFTCache::Compact: - value = (getFromReadBufCompactSigned(x, y * 2 + 1) / 32767.0) * M_PI; + value = (getFromReadBufCompactSigned(x, y * 2 + 1) / 32767.f) * float(M_PI); break; case FFTCache::Rectangular: @@ -187,7 +187,7 @@ case FFTCache::Compact: for (int i = 0; i < count; ++i) { int y = minbin + i * step; - values[i] = (getFromReadBufCompactUnsigned(x, y * 2) / 65535.0) + values[i] = (getFromReadBufCompactUnsigned(x, y * 2) / 65535.f) * getNormalizationFactor(x); } break; @@ -224,7 +224,7 @@ return m_mfc->haveSetColumnAt(x); } -int +size_t FFTFileCacheReader::getCacheSize(int width, int height, FFTCache::StorageType type) {