Mercurial > hg > svcore

diff data/fileio/OggVorbisFileReader.cpp @ 1043:fe39581d249b cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More type-size adjustments
author Chris Cannam
date Wed, 04 Mar 2015 19:08:21 +0000
parents a1cd5abcb38b
children 0a9193dc136b
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.cpp	Wed Mar 04 13:52:48 2015 +0000
+++ b/data/fileio/OggVorbisFileReader.cpp	Wed Mar 04 19:08:21 2015 +0000
@@ -144,15 +144,15 @@
     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
     FishSound *fs = reader->m_fishSound;
 
-    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+    fish_sound_prepare_truncation(fs, packet->granulepos, int(packet->e_o_s));
     fish_sound_decode(fs, packet->packet, packet->bytes);
 
     reader->m_bytesRead += packet->bytes;
 
     // The number of bytes read by this function is smaller than
     // the file size because of the packet headers
-    int p = lrint(double(reader->m_bytesRead) * 114 /
-                  double(reader->m_fileSize));
+    int p = int(lrint(double(reader->m_bytesRead) * 114 /
+                      double(reader->m_fileSize)));
     if (p > 99) p = 99;
     reader->m_completion = p;
     reader->progress(p);