Mercurial > hg > svcore
comparison data/fileio/MatchFileReader.cpp @ 980:6e6da0636e5e tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 16:36:21 +0100 |
| parents | 0a35adfb7b16 |
| children |
comparison
equal
deleted
inserted
replaced
| 954:35b05cac32d0 | 980:6e6da0636e5e |
|---|---|
| 21 #include <cmath> | 21 #include <cmath> |
| 22 #include <iostream> | 22 #include <iostream> |
| 23 | 23 |
| 24 Alignment::Alignment() : | 24 Alignment::Alignment() : |
| 25 thisHopTime(0.0), | 25 thisHopTime(0.0), |
| 26 refHopTime(0.0) | 26 refHopTime(0.0), |
| 27 m_mainModel(0) | |
| 27 { | 28 { |
| 28 } | 29 } |
| 29 | 30 |
| 30 double | 31 double |
| 31 Alignment::fromReference(double t) const | 32 Alignment::fromReference(double t) const |