Mercurial > hg > svcore

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children 2f49be7d4264
line wrap: on
line diff
--- a/data/model/Labeller.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/model/Labeller.h	Wed Jun 18 13:51:16 2014 +0100
@@ -292,7 +292,7 @@
             } else if (!prevPoint) {
                 std::cerr << "ERROR: Labeller::getValueFor: Time difference required, but only one point provided" << std::endl;
             } else {
-                size_t f0 = prevPoint->frame, f1 = newPoint.frame;
+                int f0 = prevPoint->frame, f1 = newPoint.frame;
                 if (m_type == ValueFromDurationToNext ||
                     m_type == ValueFromDurationFromPrevious) {
                     value = float(f1 - f0) / m_rate;