Merge pull request #896 from pabloEntropia/compilation_warnings_fixes

Compilation warnings fixes

src/algorithms/audioproblems/clickdetector.cpp

@@ -60,7 +60,7 @@ void ClickDetector::configure() {
   _startProc = int(_frameSize / 2 - _hopSize / 2);
   _endProc = int(_frameSize / 2 + _hopSize / 2);
 
-  if (_startProc < _order) {
+  if (_startProc < (uint)_order) {
     uint unproc = _order - _startProc;
     uint maxHop = _frameSize - 2 * _order;
     E_INFO("ClickDetector: non-optimal 'HopSize' parameter. The " << unproc << " first samples will not be processed."

src/algorithms/spectral/triangularbands.cpp

@@ -64,7 +64,7 @@ void TriangularBands::compute() {
     throw EssentiaException("TriangularBands: the size of the input spectrum is not greater than one");
   }
 
-  if (_filterCoefficients.empty() || int(_filterCoefficients[0].size()) != spectrum.size()) {
+  if (_filterCoefficients.empty() || _filterCoefficients[0].size() != spectrum.size()) {
       E_INFO("TriangularBands: input spectrum size (" << spectrum.size() << ") does not correspond to the \"inputSize\" parameter (" << _filterCoefficients[0].size() << "). Recomputing the filter bank.");
     createFilters(spectrum.size());
   }

src/algorithms/standard/peakdetection.cpp

@@ -179,20 +179,20 @@ void PeakDetection::compute() {
     std::sort(peaks.begin(), peaks.end(),
           ComparePeakMagnitude<std::greater<Real>, std::less<Real> >());
 
-    int k = 0;
+    size_t k = 0;
     while (k < peaks.size() - 1) {
       minPos = peaks[k].position - _minPeakDistance;
       maxPos = peaks[k].position + _minPeakDistance;
 
-      for (int l = k+1; l < peaks.size(); l++) {
+      for (size_t l = k+1; l < peaks.size(); l++) {
         if (peaks[l].position > minPos && peaks[l].position < maxPos) 
           deletedPeaks.push_back(l);
       }
 
       // delete peaks starting from the end so the indexes are not altered
       std::sort(deletedPeaks.begin(), deletedPeaks.end(), std::greater<int>());
 
-      for (int l = 0; l < deletedPeaks.size(); l++)
+      for (size_t l = 0; l < deletedPeaks.size(); l++)
         peaks.erase(peaks.begin() + deletedPeaks[l]);
 
       deletedPeaks.clear();
@@ -232,12 +232,12 @@ void PeakDetection::compute() {
 
 
   // we only want this many peaks
-  int nWantedPeaks = std::min((int)_maxPeaks, (int)peaks.size());
+  size_t nWantedPeaks = std::min((size_t)_maxPeaks, peaks.size());
 
   peakPosition.resize(nWantedPeaks);
   peakValue.resize(nWantedPeaks);
 
-  for (int k=0; k<nWantedPeaks; k++) {
+  for (size_t k=0; k<nWantedPeaks; k++) {
     peakPosition[k] = peaks[k].position;
     peakValue[k] = peaks[k].magnitude;
   }

src/algorithms/stats/histogram.cpp

@@ -60,7 +60,7 @@ void Histogram::compute() {
   histogram.resize(_numberBins);
   binEdges.assign(tempBinEdges.begin(), tempBinEdges.end());
 
-  for(int i = 0; i < array.size(); i++){
+  for(size_t i = 0; i < array.size(); i++){
     if(array[i] < _maxValue && array[i] >= _minValue)
       histogram[floor(array[i]/(Real)binWidth)]++;
     else if(array[i] == _maxValue) 

src/algorithms/tonal/pitchyinprobabilistic.cpp

@@ -91,7 +91,6 @@ AlgorithmStatus PitchYinProbabilistic::process() {
 
   const vector<vector<Real> >& pitchCandidates = _pool.value<vector<vector<Real> > >("frequencies");
   const vector<vector<Real> >& probabilities = _pool.value<vector<vector<Real> > >("probabilities");
-  const vector<Real>& _RMS = _pool.value<vector<Real> >("RMS");
 
   vector<Real> tempPitch;
   _yinProbabilitiesHMM->input("pitchCandidates").set(pitchCandidates);

src/algorithms/tonal/pitchyinprobabilities.cpp

@@ -285,7 +285,7 @@ void PitchYinProbabilities::compute() {
 
   Real nonPeakProb = 1.0;
   if (sumProb > 0) {
-    for (int i = minTau; i < maxTau; ++i)
+    for (size_t i = minTau; i < maxTau; ++i)
     {
         _peakProb[i] = _peakProb[i] / sumProb * _peakProb[minInd];
         nonPeakProb -= _peakProb[i];

src/algorithms/tonal/pitchyinprobabilitieshmm.cpp

@@ -66,8 +66,8 @@ void PitchYinProbabilitiesHMM::configure() {
   for (size_t iPitch = 0; iPitch < _nPitch; ++iPitch)
   {
     int theoreticalMinNextPitch = static_cast<int>(iPitch)-static_cast<int>(_transitionWidth / 2);
-    int minNextPitch = iPitch > _transitionWidth/2 ? iPitch - _transitionWidth / 2 : 0;
-    int maxNextPitch = iPitch < _nPitch - _transitionWidth / 2 ? iPitch + _transitionWidth / 2 : _nPitch - 1;
+    size_t minNextPitch = iPitch > _transitionWidth/2 ? iPitch - _transitionWidth / 2 : 0;
+    size_t maxNextPitch = iPitch < _nPitch - _transitionWidth / 2 ? iPitch + _transitionWidth / 2 : _nPitch - 1;
 
     // WEIGHT VECTOR
     Real weightSum = 0;

src/essentia/configurable.cpp

@@ -112,7 +112,7 @@ void Configurable::setParameters(const ParameterMap& params) {
 
     // check that the parameter fits in its valid range, if specified
     const string& srange = parameterRange[name];
-    auto_ptr<Range> r(Range::create(srange));
+    unique_ptr<Range> r(Range::create(srange));
 
     if (!r->contains(value)) {
       ostringstream msg;

src/essentia/utils/metadatautils.h

@@ -42,7 +42,7 @@ void pcmMetadata(const std::string& filename, int& sr, int& ch, int& bitrate) {
   }
 
   // (trick) create an audioloader to know the original samplerate
-  std::auto_ptr<streaming::Algorithm> audioloader(streaming::AlgorithmFactory::create("AudioLoader",
+  std::unique_ptr<streaming::Algorithm> audioloader(streaming::AlgorithmFactory::create("AudioLoader",
                                                                                       "filename", filename));
 
   sr = (int)streaming::lastTokenProduced<Real>(audioloader->output("sampleRate"));