diff options
| author | Robin Gareus <robin@gareus.org> | 2019-09-03 05:01:59 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-09-03 05:01:59 +0200 |
| commit | a3673809cfcedd757adf0f662b441a9e2aaf5ee5 (patch) | |
| tree | 7e03da3cefe34c49863ba21010f92f9caf11b6b9 /libs/vamp-pyin | |
| parent | 9970a243ec7efa80b02edabc3caaf01a1ca9ef9a (diff) | |
Fix -Wsign-compare
Diffstat (limited to 'libs/vamp-pyin')
| -rw-r--r-- | libs/vamp-pyin/LocalCandidatePYIN.cpp | 4 | ||||
| -rw-r--r-- | libs/vamp-pyin/MonoPitchHMM.cpp | 4 | ||||
| -rw-r--r-- | libs/vamp-pyin/YinUtil.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/vamp-pyin/LocalCandidatePYIN.cpp b/libs/vamp-pyin/LocalCandidatePYIN.cpp index 35682b1887..e90e819191 100644 --- a/libs/vamp-pyin/LocalCandidatePYIN.cpp +++ b/libs/vamp-pyin/LocalCandidatePYIN.cpp @@ -384,7 +384,7 @@ LocalCandidatePYIN::getRemainingFeatures() } vector<float> mpOut = mp.process(tempPitchProb); - float prevFreq = 0; + //float prevFreq = 0; for (size_t iFrame = 0; iFrame < nFrame; ++iFrame) { if (mpOut[iFrame] > 0) { @@ -392,7 +392,7 @@ LocalCandidatePYIN::getRemainingFeatures() pitchTracks[iCandidate][iFrame] = mpOut[iFrame]; freqSum[iCandidate] += mpOut[iFrame]; freqNumber[iCandidate]++; - prevFreq = mpOut[iFrame]; + //prevFreq = mpOut[iFrame]; } } diff --git a/libs/vamp-pyin/MonoPitchHMM.cpp b/libs/vamp-pyin/MonoPitchHMM.cpp index 29dd7e04df..b5ab2984f8 100644 --- a/libs/vamp-pyin/MonoPitchHMM.cpp +++ b/libs/vamp-pyin/MonoPitchHMM.cpp @@ -89,8 +89,8 @@ MonoPitchHMM::build() for (size_t iPitch = 0; iPitch < m_nPitch; ++iPitch) { int theoreticalMinNextPitch = static_cast<int>(iPitch)-static_cast<int>(m_transitionWidth/2); - int minNextPitch = iPitch>m_transitionWidth/2 ? iPitch-m_transitionWidth/2 : 0; - int maxNextPitch = iPitch<m_nPitch-m_transitionWidth/2 ? iPitch+m_transitionWidth/2 : m_nPitch-1; + size_t minNextPitch = iPitch>m_transitionWidth/2 ? iPitch-m_transitionWidth/2 : 0; + size_t maxNextPitch = iPitch<m_nPitch-m_transitionWidth/2 ? iPitch+m_transitionWidth/2 : m_nPitch-1; // WEIGHT VECTOR double weightSum = 0; diff --git a/libs/vamp-pyin/YinUtil.cpp b/libs/vamp-pyin/YinUtil.cpp index a74cfebd50..b6d5a10fd8 100644 --- a/libs/vamp-pyin/YinUtil.cpp +++ b/libs/vamp-pyin/YinUtil.cpp @@ -28,7 +28,7 @@ YinUtil::slowDifference(const double *in, double *yinBuffer, const size_t yinBuf double delta ; int startPoint = 0; int endPoint = 0; - for (int i = 1; i < yinBufferSize; ++i) { + for (size_t i = 1; i < yinBufferSize; ++i) { yinBuffer[i] = 0; startPoint = yinBufferSize/2 - i/2; endPoint = startPoint + yinBufferSize; |