comparison data/model/Labeller.h @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children 2f49be7d4264
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
290 if (m_rate == 0.f) { 290 if (m_rate == 0.f) {
291 std::cerr << "ERROR: Labeller::getValueFor: Real-time conversion required, but no sample rate set" << std::endl; 291 std::cerr << "ERROR: Labeller::getValueFor: Real-time conversion required, but no sample rate set" << std::endl;
292 } else if (!prevPoint) { 292 } else if (!prevPoint) {
293 std::cerr << "ERROR: Labeller::getValueFor: Time difference required, but only one point provided" << std::endl; 293 std::cerr << "ERROR: Labeller::getValueFor: Time difference required, but only one point provided" << std::endl;
294 } else { 294 } else {
295 size_t f0 = prevPoint->frame, f1 = newPoint.frame; 295 int f0 = prevPoint->frame, f1 = newPoint.frame;
296 if (m_type == ValueFromDurationToNext || 296 if (m_type == ValueFromDurationToNext ||
297 m_type == ValueFromDurationFromPrevious) { 297 m_type == ValueFromDurationFromPrevious) {
298 value = float(f1 - f0) / m_rate; 298 value = float(f1 - f0) / m_rate;
299 } else { 299 } else {
300 if (f1 > f0) { 300 if (f1 > f0) {