Mercurial > hg > svapp

diff framework/SVFileReader.cpp @ 358:2da91cceed64 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some tidying & fixing compiler warnings
author Chris Cannam
date Thu, 12 Jun 2014 18:52:52 +0100
parents a93802543a5a
children 88bf6cc73275 b38268e34c09
line wrap: on
line diff
--- a/framework/SVFileReader.cpp	Thu Jun 12 14:24:48 2014 +0100
+++ b/framework/SVFileReader.cpp	Thu Jun 12 18:52:52 2014 +0100
@@ -300,7 +300,7 @@
     } else if (name == "derivation") {
 
         if (!m_currentDerivedModel) {
-            if (m_currentDerivedModel < 0) {
+            if (m_currentDerivedModelId < 0) {
                 cerr << "WARNING: SV-XML: Bad derivation output model id "
                           << m_currentDerivedModelId << endl;
             } else if (haveModel(m_currentDerivedModelId)) {
@@ -1150,7 +1150,7 @@
 
 	for (QStringList::iterator i = data.begin(); i != data.end(); ++i) {
 
-	    if (values.size() == dtdm->getHeight()) {
+	    if (values.size() == (int)dtdm->getHeight()) {
 		if (!warned) {
 		    cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row "
 			      << m_rowNumber << endl;