Fix build failure due to gsl 1.15 --> 1.16 upgrade

diff --git a/debian/patches/series b/debian/patches/series
index 4277de1289da0f79046007582058505143729fb1..116b8c925aff1a836aeed9b39c07481ae9df7f7a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+src-fft-cpp.patch
 CMakeLists-txt.patch

diff --git a/debian/patches/src-fft-cpp.patch b/debian/patches/src-fft-cpp.patch
new file mode 100644 (file)
index 0000000..bd7184f
--- /dev/null
+++ b/debian/patches/src-fft-cpp.patch
@@ -0,0 +1,11 @@
+--- a/src/fft.cpp
++++ b/src/fft.cpp
+@@ -82,7 +82,7 @@
+ void MGL_EXPORT mgl_fft(double *x, long s, long n, const void *wt, void *ws, bool inv)
+ {
+ #if MGL_HAVE_GSL
+-gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?backward:forward);
++gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?gsl_fft_backward:gsl_fft_forward);
+ #else // NOTE this is VERY slow!
+       const double *c = (const double *)wt;
+       double *d = (double *)ws, f = inv?1./n:1;

diff --git a/src/fft.cpp b/src/fft.cpp
index 486154d29eed18eb202ffbca1f82de84673c5e8b..ba62d21b85383e02568dbe7f57ac44f7dcbb4696 100644 (file)
--- a/src/fft.cpp
+++ b/src/fft.cpp
@@ -82,7 +82,7 @@ void MGL_EXPORT mgl_fft_free(void *wt, void **ws, long nthr)
 void MGL_EXPORT mgl_fft(double *x, long s, long n, const void *wt, void *ws, bool inv)
 {
 #if MGL_HAVE_GSL
-gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?backward:forward);
+gsl_fft_complex_transform(x, s, n, (const gsl_fft_complex_wavetable*)wt, (gsl_fft_complex_workspace*)ws, inv?gsl_fft_backward:gsl_fft_forward);
 #else  // NOTE this is VERY slow!
        const double *c = (const double *)wt;
        double *d = (double *)ws, f = inv?1./n:1;