Mercurial > hg > svcore

comparison data/model/Model.cpp @ 929:59e7fe1b1003 warnfix_no_size_t

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents e802e550a1f2
children 4b9fc70a37d5
comparison
equal deleted inserted replaced
928:6a94bb528e9d 929:59e7fe1b1003
104 return 0; 104 return 0;
105 } 105 }
106 return m_alignment->getReferenceModel(); 106 return m_alignment->getReferenceModel();
107 } 107 }
108 108
109 size_t 109 int
110 Model::alignToReference(size_t frame) const 110 Model::alignToReference(int frame) const
111 { 111 {
112 if (!m_alignment) { 112 if (!m_alignment) {
113 if (m_sourceModel) return m_sourceModel->alignToReference(frame); 113 if (m_sourceModel) return m_sourceModel->alignToReference(frame);
114 else return frame; 114 else return frame;
115 } 115 }
116 size_t refFrame = m_alignment->toReference(frame); 116 int refFrame = m_alignment->toReference(frame);
117 const Model *m = m_alignment->getReferenceModel(); 117 const Model *m = m_alignment->getReferenceModel();
118 if (m && refFrame > m->getEndFrame()) refFrame = m->getEndFrame(); 118 if (m && refFrame > m->getEndFrame()) refFrame = m->getEndFrame();
119 return refFrame; 119 return refFrame;
120 } 120 }
121 121
122 size_t 122 int
123 Model::alignFromReference(size_t refFrame) const 123 Model::alignFromReference(int refFrame) const
124 { 124 {
125 if (!m_alignment) { 125 if (!m_alignment) {
126 if (m_sourceModel) return m_sourceModel->alignFromReference(refFrame); 126 if (m_sourceModel) return m_sourceModel->alignFromReference(refFrame);
127 else return refFrame; 127 else return refFrame;
128 } 128 }
129 size_t frame = m_alignment->fromReference(refFrame); 129 int frame = m_alignment->fromReference(refFrame);
130 if (frame > getEndFrame()) frame = getEndFrame(); 130 if (frame > getEndFrame()) frame = getEndFrame();
131 return frame; 131 return frame;
132 } 132 }
133 133
134 int 134 int