comparison data/model/FFTModel.cpp @ 1221:a1b97df9962e 3.0-integration

Merge from branch msvc2015_64

 
 #include <algorithm>
 
 #include <cassert>
 #include <deque>
-
-#ifndef __GNUC__
-#include <alloca.h>
-#endif
 
 using namespace std;
 
 FFTModel::FFTModel(const DenseTimeValueModel *model,
                    int channel,

         int minbin = ymin;
         if (minbin > 0) minbin = minbin - 1;
         int maxbin = ymax;
         if (maxbin < getHeight() - 1) maxbin = maxbin + 1;
         const int n = maxbin - minbin + 1;
-#ifdef __GNUC__
-        float values[n];
-#else
-        float *values = (float *)alloca(n * sizeof(float));
-#endif
+        float *values = new float[n];
         getMagnitudesAt(x, values, minbin, maxbin - minbin + 1);
         for (int bin = ymin; bin <= ymax; ++bin) {
             if (bin == minbin || bin == maxbin) continue;
             if (values[bin - minbin] > values[bin - minbin - 1] &&
                 values[bin - minbin] > values[bin - minbin + 1]) {
                 peaks.insert(bin);
             }
         }
+        delete[] values;
         return peaks;
     }
 
     Column values = getColumn(x);
     int nv = int(values.size());