Mercurial > hg > svcore

diff data/fileio/CSVFormat.cpp @ 1007:ba404199345f tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 10 Nov 2014 09:19:49 +0000
parents 1974859baba5
children 1888ca033a84
line wrap: on
line diff
--- a/data/fileio/CSVFormat.cpp	Tue Sep 09 16:36:21 2014 +0100
+++ b/data/fileio/CSVFormat.cpp	Mon Nov 10 09:19:49 2014 +0000
@@ -103,7 +103,7 @@
     QStringList list = StringBits::split(line, m_separator[0], m_allowQuoting);
 
     int cols = list.size();
-    if (lineno == 0 || (cols < m_columnCount)) m_columnCount = cols;
+    if (lineno == 0 || (cols > m_columnCount)) m_columnCount = cols;
     if (cols != m_columnCount) m_variableColumnCount = true;
 
     // All columns are regarded as having these qualities until we see