Mercurial > hg > svapp
comparison framework/SVFileReader.cpp @ 358:2da91cceed64 tonioni
Some tidying & fixing compiler warnings
author | Chris Cannam |
---|---|
date | Thu, 12 Jun 2014 18:52:52 +0100 |
parents | a93802543a5a |
children | 88bf6cc73275 b38268e34c09 |
comparison
equal
deleted
inserted
replaced
357:337cdb5e5b06 | 358:2da91cceed64 |
---|---|
298 m_inData = false; | 298 m_inData = false; |
299 | 299 |
300 } else if (name == "derivation") { | 300 } else if (name == "derivation") { |
301 | 301 |
302 if (!m_currentDerivedModel) { | 302 if (!m_currentDerivedModel) { |
303 if (m_currentDerivedModel < 0) { | 303 if (m_currentDerivedModelId < 0) { |
304 cerr << "WARNING: SV-XML: Bad derivation output model id " | 304 cerr << "WARNING: SV-XML: Bad derivation output model id " |
305 << m_currentDerivedModelId << endl; | 305 << m_currentDerivedModelId << endl; |
306 } else if (haveModel(m_currentDerivedModelId)) { | 306 } else if (haveModel(m_currentDerivedModelId)) { |
307 cerr << "WARNING: SV-XML: Derivation has existing model " | 307 cerr << "WARNING: SV-XML: Derivation has existing model " |
308 << m_currentDerivedModelId | 308 << m_currentDerivedModelId |
1148 | 1148 |
1149 DenseThreeDimensionalModel::Column values; | 1149 DenseThreeDimensionalModel::Column values; |
1150 | 1150 |
1151 for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { | 1151 for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { |
1152 | 1152 |
1153 if (values.size() == dtdm->getHeight()) { | 1153 if (values.size() == (int)dtdm->getHeight()) { |
1154 if (!warned) { | 1154 if (!warned) { |
1155 cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " | 1155 cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " |
1156 << m_rowNumber << endl; | 1156 << m_rowNumber << endl; |
1157 warned = true; | 1157 warned = true; |
1158 } | 1158 } |