Mercurial > hg > svcore

comparison data/model/SparseValueModel.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children a1cd5abcb38b
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
29 29
30 template <typename PointType> 30 template <typename PointType>
31 class SparseValueModel : public SparseModel<PointType> 31 class SparseValueModel : public SparseModel<PointType>
32 { 32 {
33 public: 33 public:
34 SparseValueModel(size_t sampleRate, size_t resolution, 34 SparseValueModel(int sampleRate, int resolution,
35 bool notifyOnAdd = true) : 35 bool notifyOnAdd = true) :
36 SparseModel<PointType>(sampleRate, resolution, notifyOnAdd), 36 SparseModel<PointType>(sampleRate, resolution, notifyOnAdd),
37 m_valueMinimum(0.f), 37 m_valueMinimum(0.f),
38 m_valueMaximum(0.f), 38 m_valueMaximum(0.f),
39 m_haveExtents(false) 39 m_haveExtents(false)
40 { } 40 { }
41 41
42 SparseValueModel(size_t sampleRate, size_t resolution, 42 SparseValueModel(int sampleRate, int resolution,
43 float valueMinimum, float valueMaximum, 43 float valueMinimum, float valueMaximum,
44 bool notifyOnAdd = true) : 44 bool notifyOnAdd = true) :
45 SparseModel<PointType>(sampleRate, resolution, notifyOnAdd), 45 SparseModel<PointType>(sampleRate, resolution, notifyOnAdd),
46 m_valueMinimum(valueMinimum), 46 m_valueMinimum(valueMinimum),
47 m_valueMaximum(valueMaximum), 47 m_valueMaximum(valueMaximum),