Mercurial > hg > svcore

changeset 942:0009b2b066e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 02 Jul 2014 08:42:33 +0100
parents 3be40cf40c49 (diff) 5bd05a24e32a (current diff)
children 178ffa964096 a6bfe009523a
files data/model/EditableDenseThreeDimensionalModel.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/EditableDenseThreeDimensionalModel.cpp	Tue Jul 01 15:31:25 2014 +0100
+++ b/data/model/EditableDenseThreeDimensionalModel.cpp	Wed Jul 02 08:42:33 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) {