comparison layer/SliceLayer.h @ 805:1d526ba11a24 warnfix_no_size_t

Remove size_t's and fix warnings in layer/
author Chris Cannam
date Tue, 17 Jun 2014 15:18:06 +0100
parents 5b72899d692b
children b66fb15de477
comparison
equal deleted inserted replaced
782:ddae586bc47b 805:1d526ba11a24
113 virtual int getBinForX(float x, int totalBins, float w) const; 113 virtual int getBinForX(float x, int totalBins, float w) const;
114 114
115 virtual float getYForValue(float value, const View *v, float &norm) const; 115 virtual float getYForValue(float value, const View *v, float &norm) const;
116 virtual float getValueForY(float y, const View *v) const; 116 virtual float getValueForY(float y, const View *v) const;
117 117
118 virtual QString getFeatureDescription(View *v, QPoint &, 118 virtual QString getFeatureDescriptionAux(View *v, QPoint &,
119 bool includeBinDescription, 119 bool includeBinDescription,
120 int &minbin, int &maxbin, 120 int &minbin, int &maxbin,
121 int &range) const; 121 int &range) const;
122 122
123 // This curve may, of course, be flat -- the spectrum uses it for 123 // This curve may, of course, be flat -- the spectrum uses it for
124 // normalizing the fft results by the fft size (with 1/(fftsize/2) 124 // normalizing the fft results by the fft size (with 1/(fftsize/2)
125 // in each bin). 125 // in each bin).
126 typedef std::vector<float> BiasCurve; 126 typedef std::vector<float> BiasCurve;
142 float m_gain; 142 float m_gain;
143 mutable std::vector<int> m_scalePoints; 143 mutable std::vector<int> m_scalePoints;
144 mutable std::map<const View *, int> m_xorigins; 144 mutable std::map<const View *, int> m_xorigins;
145 mutable std::map<const View *, int> m_yorigins; 145 mutable std::map<const View *, int> m_yorigins;
146 mutable std::map<const View *, int> m_heights; 146 mutable std::map<const View *, int> m_heights;
147 mutable size_t m_currentf0; 147 mutable int m_currentf0;
148 mutable size_t m_currentf1; 148 mutable int m_currentf1;
149 mutable std::vector<float> m_values; 149 mutable std::vector<float> m_values;
150 }; 150 };
151 151
152 #endif 152 #endif