# HG changeset patch
# User Chris Cannam
# Date 1404286953 -3600
# Node ID 0009b2b066e0276e892e4e0c2e2a4f2876d5f3ac
# Parent  3be40cf40c492b9828c39fd8e6cf81995f462d96# Parent  5bd05a24e32a95a7a347b086d7904be92801586c
Merge

diff -r 5bd05a24e32a -r 0009b2b066e0 data/model/EditableDenseThreeDimensionalModel.cpp
--- 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) {