# HG changeset patch
# User Chris Cannam
# Date 1434445956 -3600
# Node ID 96cdf661d5389f269ac8c8cd05619fe61bbc7a9d
# Parent  a69901aa85d26ab4eda8f34b71dfa3528ed81514# Parent  632c662e95e7088ae78e134729e62dde33e80cc9
Merge from branch vh

diff -r 632c662e95e7 -r 96cdf661d538 build/Makefile.osx
--- a/build/Makefile.osx	Wed May 20 17:46:17 2015 +0100
+++ b/build/Makefile.osx	Tue Jun 16 10:12:36 2015 +0100
@@ -60,12 +60,12 @@
 
 # Minimum version of OS/X to target. This will determine the
 # compiler's choice of platform SDK material
-MINVERSION := 10.6
+MINVERSION := 10.7
 
 # Our default is to try to build for all architectures supported by
 # the MINVERSION in a universal binary.
 #
-ARCHFLAGS ?= -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386
+ARCHFLAGS ?= -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386 -stdlib=libc++
 
 # Compile flags
 #
diff -r 632c662e95e7 -r 96cdf661d538 examples/AmplitudeFollower.cpp
--- a/examples/AmplitudeFollower.cpp	Wed May 20 17:46:17 2015 +0100
+++ b/examples/AmplitudeFollower.cpp	Tue Jun 16 10:12:36 2015 +0100
@@ -41,6 +41,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
+#include <algorithm>
 
 using std::string;
 using std::vector;
diff -r 632c662e95e7 -r 96cdf661d538 examples/ZeroCrossing.cpp
--- a/examples/ZeroCrossing.cpp	Wed May 20 17:46:17 2015 +0100
+++ b/examples/ZeroCrossing.cpp	Tue Jun 16 10:12:36 2015 +0100
@@ -42,6 +42,7 @@
 using std::endl;
 
 #include <cmath>
+#include <algorithm>
 
 ZeroCrossing::ZeroCrossing(float inputSampleRate) :
     Plugin(inputSampleRate),
diff -r 632c662e95e7 -r 96cdf661d538 vamp-sdk/FFT.h
--- a/vamp-sdk/FFT.h	Wed May 20 17:46:17 2015 +0100
+++ b/vamp-sdk/FFT.h	Tue Jun 16 10:12:36 2015 +0100
@@ -60,6 +60,7 @@
 public:
     /**
      * Calculate a forward transform of size n.
+     * n must be a power of 2, greater than 1.
      *
      * ri and ii must point to the real and imaginary component arrays
      * of the input. For real input, ii may be NULL.
@@ -75,6 +76,7 @@
 
     /**
      * Calculate an inverse transform of size n.
+     * n must be a power of 2, greater than 1.
      *
      * ri and ii must point to the real and imaginary component arrays
      * of the input. For real input, ii may be NULL.