comparison data/fileio/CodedAudioFileReader.cpp @ 1110:1517d4c60e88

Fix a number of warnings in the 32-bit build
author Chris Cannam
date Wed, 01 Jul 2015 15:53:54 +0100
parents e603b44510c3
children 457a1a619c5f 5b463c7727e5
comparison
equal deleted inserted replaced
1088:5fab8e4f5f19 1110:1517d4c60e88
437 437
438 sv_frame_t idx = start * m_channelCount; 438 sv_frame_t idx = start * m_channelCount;
439 sv_frame_t i = 0; 439 sv_frame_t i = 0;
440 sv_frame_t n = count * m_channelCount; 440 sv_frame_t n = count * m_channelCount;
441 441
442 frames.resize(n); 442 frames.resize(size_t(n));
443 443
444 m_dataLock.lockForRead(); 444 m_dataLock.lockForRead();
445 while (i < n && in_range_for(m_data, idx)) { 445 while (i < n && in_range_for(m_data, idx)) {
446 frames[i++] = m_data[idx++]; 446 frames[size_t(i++)] = m_data[size_t(idx++)];
447 } 447 }
448 m_dataLock.unlock(); 448 m_dataLock.unlock();
449 449
450 frames.resize(i); 450 frames.resize(size_t(i));
451 } 451 }
452 } 452 }
453 453
454 if (m_normalised) { 454 if (m_normalised) {
455 for (auto &f: frames) f *= m_gain; 455 for (auto &f: frames) f *= m_gain;