Mercurial > hg > svcore

diff data/fft/FFTFileCacheWriter.cpp @ 1038:cc27f35aa75c cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/data/fft/FFTFileCacheWriter.cpp	Tue Mar 03 09:33:59 2015 +0000
+++ b/data/fft/FFTFileCacheWriter.cpp	Tue Mar 03 15:18:24 2015 +0000
@@ -40,7 +40,7 @@
     m_factorSize(storageType == FFTCache::Compact ? 2 : 1),
     m_mfc(new MatrixFile
           (fileBase, MatrixFile::WriteOnly, 
-           storageType == FFTCache::Compact ? sizeof(uint16_t) : sizeof(float),
+           int((storageType == FFTCache::Compact) ? sizeof(uint16_t) : sizeof(float)),
            width, height * 2 + m_factorSize))
 {
 #ifdef DEBUG_FFT_FILE_CACHE_WRITER
@@ -175,7 +175,7 @@
     m_mfc->setColumnAt(x, m_writebuf);
 }
 
-int
+size_t
 FFTFileCacheWriter::getCacheSize(int width, int height,
                                  FFTCache::StorageType type)
 {