comparison dsp/onsets/PeakPicking.cpp @ 102:37449f085a4c

Fix compiler warnings
author Chris Cannam
date Thu, 13 Jun 2013 10:23:09 +0100
parents 88f3cfcff55f
children f976d7609700
comparison
equal deleted inserted replaced
101:452615c4bab4 102:37449f085a4c
87 m_maxima.push_back( m_workBuffer[ u ] ); 87 m_maxima.push_back( m_workBuffer[ u ] );
88 } 88 }
89 89
90 quadEval( m_maxima, onsets ); 90 quadEval( m_maxima, onsets );
91 91
92 for( int b = 0; b < m_maxima.size(); b++) 92 for( int b = 0; b < (int)m_maxima.size(); b++)
93 { 93 {
94 src[ b ] = m_maxima[ b ]; 94 src[ b ] = m_maxima[ b ];
95 } 95 }
96 } 96 }
97 97
104 104
105 vector <double> m_maxFit; 105 vector <double> m_maxFit;
106 vector <double> m_poly; 106 vector <double> m_poly;
107 vector <double> m_err; 107 vector <double> m_err;
108 108
109 double p; 109 // double p;
110 110
111 m_poly.push_back(0); 111 m_poly.push_back(0);
112 m_poly.push_back(0); 112 m_poly.push_back(0);
113 m_poly.push_back(0); 113 m_poly.push_back(0);
114 114
135 { 135 {
136 selMax = src[ m_maxIndex[j] + k ] ; 136 selMax = src[ m_maxIndex[j] + k ] ;
137 m_maxFit.push_back(selMax); 137 m_maxFit.push_back(selMax);
138 } 138 }
139 139
140 p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly); 140 // p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly);
141 141
142 double f = m_poly[0]; 142 double f = m_poly[0];
143 double g = m_poly[1]; 143 // double g = m_poly[1];
144 double h = m_poly[2]; 144 double h = m_poly[2];
145 145
146 int kk = m_poly.size(); 146 // int kk = m_poly.size();
147 147
148 if (h < -Qfilta || f > Qfiltc) 148 if (h < -Qfilta || f > Qfiltc)
149 { 149 {
150 idx.push_back(m_maxIndex[j]); 150 idx.push_back(m_maxIndex[j]);
151 } 151 }