# HG changeset patch # User Chris Cannam # Date 1481310273 0 # Node ID 4dbb7a7c9c2898c31dac32d5e54cbb92daaf1665 # Parent e939a365e4d21169464274df3e66f929854e0942 Fix compiler warnings diff -r e939a365e4d2 -r 4dbb7a7c9c28 data/fileio/CodedAudioFileReader.cpp --- 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); diff -r e939a365e4d2 -r 4dbb7a7c9c28 data/fileio/test/AudioFileReaderTest.h --- 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;