Mercurial > hg > svcore
diff data/model/EditableDenseThreeDimensionalModel.cpp @ 941:3be40cf40c49
Tidy
author | Chris Cannam |
---|---|
date | Wed, 02 Jul 2014 08:42:11 +0100 |
parents | df82da55e86a |
children | 0009b2b066e0 |
line wrap: on
line diff
--- a/data/model/EditableDenseThreeDimensionalModel.cpp Wed Jun 18 18:30:19 2014 +0100 +++ b/data/model/EditableDenseThreeDimensionalModel.cpp Wed Jul 02 08:42:11 2014 +0100 @@ -287,7 +287,7 @@ { // See comment above m_trunc declaration in header - assert(int(index) < m_data.size()); + assert(index >= 0 && index < int(m_data.size())); Column c = m_data.at(index); if (index == 0) { return c; @@ -301,7 +301,7 @@ if (trunc < 0) { top = false; tdist = -trunc; } Column p = expandAndRetrieve(index - tdist); int psize = p.size(), csize = c.size(); - if (psize != int(m_yBinCount)) { + if (psize != m_yBinCount) { cerr << "WARNING: EditableDenseThreeDimensionalModel::expandAndRetrieve: Trying to expand from incorrectly sized column" << endl; } if (top) {