Mercurial > hg > svcore
diff data/fileio/CSVFormat.cpp @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | 5f1b2a117a4f |
line wrap: on
line diff
--- a/data/fileio/CSVFormat.cpp Tue Apr 17 10:03:51 2018 +0100 +++ b/data/fileio/CSVFormat.cpp Tue Apr 17 10:35:42 2018 +0100 @@ -114,7 +114,7 @@ ColumnNumeric | ColumnIntegral | ColumnIncreasing | ColumnNearEmpty; for (int i = 0; i < cols; ++i) { - + while (m_columnQualities.size() <= i) { m_columnQualities.push_back(defaultQualities); m_prevValues.push_back(0.f); @@ -197,7 +197,7 @@ { m_timingType = CSVFormat::ImplicitTiming; m_timeUnits = CSVFormat::TimeWindows; - + int timingColumnCount = 0; // if our first column has zero or one entries in it and the rest