Mercurial > hg > svcore
diff data/model/Model.cpp @ 929:59e7fe1b1003 warnfix_no_size_t
Unsigned removals and warning fixes in data/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 14:33:42 +0100 |
parents | e802e550a1f2 |
children | 4b9fc70a37d5 |
line wrap: on
line diff
--- a/data/model/Model.cpp Tue Jun 17 13:52:07 2014 +0100 +++ b/data/model/Model.cpp Tue Jun 17 14:33:42 2014 +0100 @@ -106,27 +106,27 @@ return m_alignment->getReferenceModel(); } -size_t -Model::alignToReference(size_t frame) const +int +Model::alignToReference(int frame) const { if (!m_alignment) { if (m_sourceModel) return m_sourceModel->alignToReference(frame); else return frame; } - size_t refFrame = m_alignment->toReference(frame); + int refFrame = m_alignment->toReference(frame); const Model *m = m_alignment->getReferenceModel(); if (m && refFrame > m->getEndFrame()) refFrame = m->getEndFrame(); return refFrame; } -size_t -Model::alignFromReference(size_t refFrame) const +int +Model::alignFromReference(int refFrame) const { if (!m_alignment) { if (m_sourceModel) return m_sourceModel->alignFromReference(refFrame); else return refFrame; } - size_t frame = m_alignment->fromReference(refFrame); + int frame = m_alignment->fromReference(refFrame); if (frame > getEndFrame()) frame = getEndFrame(); return frame; }