# HG changeset patch # User Chris Cannam # Date 1386181849 0 # Node ID cc3f78e89df010bf6e87c735688738b980f51385 # Parent 8593a3fe50ace3c509f1cc5331c98af289c5de80# Parent c2a399f9384327b2e20c8660c35002b2a73c1e66 Merge from default branch diff -r 8593a3fe50ac -r cc3f78e89df0 data/model/SparseModel.h --- a/data/model/SparseModel.h Wed Dec 04 18:29:53 2013 +0000 +++ b/data/model/SparseModel.h Wed Dec 04 18:30:49 2013 +0000 @@ -161,7 +161,7 @@ { QString s; for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) { - if (i->frame >= f0 && i->frame < f1) { + if (i->frame >= (long)f0 && i->frame < (long)f1) { s += i->toDelimitedDataString(delimiter, m_sampleRate) + "\n"; } }