Mercurial > hg > svcore

changeset 1323:4dbb7a7c9c28 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings
author Chris Cannam
date Fri, 09 Dec 2016 19:04:33 +0000
parents e939a365e4d2
children d4a28d1479a8 3aea4f7617bb
files data/fileio/CodedAudioFileReader.cpp data/fileio/test/AudioFileReaderTest.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp	Fri Dec 09 18:01:55 2016 +0000
+++ b/data/fileio/CodedAudioFileReader.cpp	Fri Dec 09 19:04:33 2016 +0000
@@ -488,7 +488,7 @@
             (m_resampleBuffer,
              m_resampleBufferFrames,
              buffer,
-             sz,
+             int(sz),
              ratio,
              false);
 
@@ -513,7 +513,7 @@
             (m_resampleBuffer,
              m_resampleBufferFrames,
              padding,
-             padFrames,
+             int(padFrames),
              ratio,
              true);
 
--- a/data/fileio/test/AudioFileReaderTest.h	Fri Dec 09 18:01:55 2016 +0000
+++ b/data/fileio/test/AudioFileReaderTest.h	Fri Dec 09 19:04:33 2016 +0000
@@ -459,7 +459,7 @@
             
             for (sv_frame_t i = refFrames; i + offset < read; ++i) {
                 sv_frame_t ix = i + offset;
-                float quiet = 0.1; //!!! allow some ringing - but let's come back to this, it should tail off
+                float quiet = 0.1f; //!!! allow some ringing - but let's come back to this, it should tail off
                 float mag = fabsf(test[ix * channels + c]);
                 if (mag > quiet) {
                     cerr << "ERROR: audiofile " << audiofile << " contains spurious data after end of reference (found sample " << test[ix * channels + c] << " at index " << ix << " of channel " << c << " after reference+offset ended at " << refFrames+offset << ")" << endl;