diff framework/SVFileReader.cpp @ 412:c1b2b8b84165 tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 7657075ecfca
children 72c662fe7ea3
line wrap: on
line diff
--- a/framework/SVFileReader.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/framework/SVFileReader.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -58,15 +58,20 @@
     m_paneCallback(callback),
     m_location(location),
     m_currentPane(0),
+    m_currentLayer(0),
     m_currentDataset(0),
     m_currentDerivedModel(0),
     m_currentDerivedModelId(-1),
     m_currentPlayParameters(0),
     m_currentTransformSource(0),
+    m_currentTransformChannel(0),
+    m_currentTransformIsNewStyle(true),
     m_datasetSeparator(" "),
     m_inRow(false),
     m_inLayer(false),
     m_inView(false),
+    m_inData(false),
+    m_inSelections(false),
     m_rowNumber(0),
     m_ok(false)
 {