changeset 1152:fc00a06feecd 3.0-integration

Merge from branch "msvc2015_64"

--- a/layer/Colour3DPlotLayer.cpp	Tue Sep 20 09:16:55 2016 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Thu Oct 20 11:20:27 2016 +0100
@@ -37,10 +37,6 @@
 
 #include <cassert>
 
-#ifndef __GNUC__
-#include <alloca.h>
-#endif
-
 using std::vector;
 
 //#define DEBUG_COLOUR_3D_PLOT_LAYER_PAINT 1
@@ -609,7 +605,7 @@
 }
 
 bool
-Colour3DPlotLayer::isLayerScrollable(const LayerGeometryProvider */* v */) const
+Colour3DPlotLayer::isLayerScrollable(const LayerGeometryProvider * /* v */) const
 {
     if (m_normalizeVisibleArea) {
         return false;

--- a/layer/SpectrogramLayer.cpp	Tue Sep 20 09:16:55 2016 +0100
+++ b/layer/SpectrogramLayer.cpp	Thu Oct 20 11:20:27 2016 +0100
@@ -48,10 +48,6 @@
 #include <cassert>
 #include <cmath>
 
-#ifndef __GNUC__
-#include <alloca.h>
-#endif
-
 //#define DEBUG_SPECTROGRAM 1
 //#define DEBUG_SPECTROGRAM_REPAINT 1
 

--- a/svgui.pro	Tue Sep 20 09:16:55 2016 +0100
+++ b/svgui.pro	Thu Oct 20 11:20:27 2016 +0100
@@ -17,8 +17,10 @@
         LIBS += -L../sv-dependency-builds/win32-mingw/lib
     }
     win32-msvc* {
-        INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include
-        LIBS += -L../sv-dependency-builds/win32-msvc/lib
+        # We actually expect MSVC to be used only for 64-bit builds,
+        # though the qmake spec is still called win32-msvc*
+        INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include
+        LIBS += -L../sv-dependency-builds/win64-msvc/lib
     }
     macx* {
         INCLUDEPATH += ../sv-dependency-builds/osx/include
@@ -26,6 +28,11 @@
     }
 
     DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_RUBBERBAND HAVE_LIBLO HAVE_MAD HAVE_ID3TAG
+
+    win32-msvc* {
+        DEFINES += NOMINMAX _USE_MATH_DEFINES
+        DEFINES -= HAVE_LIBLO
+    }
 }
 
 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11

--- a/view/View.cpp	Tue Sep 20 09:16:55 2016 +0100
+++ b/view/View.cpp	Thu Oct 20 11:20:27 2016 +0100
@@ -46,8 +46,6 @@
 #include <cassert>
 #include <cmath>
 
-#include <unistd.h>
-
 //#define DEBUG_VIEW 1
 //#define DEBUG_VIEW_WIDGET_PAINT 1
 

--- a/widgets/WindowShapePreview.cpp	Tue Sep 20 09:16:55 2016 +0100
+++ b/widgets/WindowShapePreview.cpp	Thu Oct 20 11:20:27 2016 +0100
@@ -26,9 +26,6 @@
 
 #include <iostream>
 
-#ifndef __GNUC__
-#include <alloca.h>
-#endif
 
 WindowShapePreview::WindowShapePreview(QWidget *parent) :
     QFrame(parent),
@@ -71,12 +68,7 @@
     
     path = QPainterPath();
 
-#ifdef __GNUC__
-    float acc[w];
-#else
-    float *acc = (float *)alloca(w * sizeof(float));
-#endif
-
+    float *acc = new float(w);
     for (int i = 0; i < w; ++i) acc[i] = 0.f;
     for (int j = 0; j < 3; ++j) {
         for (int i = 0; i < step * 2; ++i) {
@@ -88,6 +80,7 @@
         if (i == 0) path.moveTo(i, y);
         else path.lineTo(i, y);
     }
+    delete[] acc;
 
     timePainter.drawPath(path);
     timePainter.setRenderHint(QPainter::Antialiasing, false);