[xiph-commits] r14967 - in trunk/speex: . libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2008-05-27 06:01:33 -0700 (Tue, 27 May 2008)
New Revision: 14967

Modified:
   trunk/speex/configure.ac
   trunk/speex/libspeex/fftwrap.c
Log:
Fix to FFTW3 patch by Thorvald Natvig


Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2008-05-27 11:12:08 UTC (rev 14966)
+++ trunk/speex/configure.ac	2008-05-27 13:01:33 UTC (rev 14967)
@@ -110,10 +110,13 @@
 )
 AC_MSG_RESULT($has_visibility)
 
-AC_ARG_WITH([gpl-fftw3], [AS_HELP_STRING([--with-gpl-fftw3],[enable experimental support for FFTW3 library for FFT])],[],[with_fftw3=no])
+AC_ARG_WITH([gpl-fftw3], [AS_HELP_STRING([--with-gpl-fftw3@<:@=PATH@:>@],[enable experimental support for FFTW3 library for FFT. @<:@default=no@:>@])],[],[with_gpl_fftw3=no])
 
-AS_IF([test "x$with_fftw3" != "xno"],
-  [PKG_CHECK_MODULES(FFTW3, fftw3f, [
+AS_IF([test "x$with_gpl_fftw3" != "xno"],
+  [if test "x$with_gpl_fftw3" != "xyes"; then
+     export PKG_CONFIG_PATH=$with_gpl_fftw3:$with_gpl_fftw3/lib/pkgconfig:$PKG_CONFIG_PATH
+   fi
+   PKG_CHECK_MODULES(FFTW3, fftw3f, [
    AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT])
    AC_SUBST([FFTW3_PKGCONFIG], [fftw3f])
   ]])

Modified: trunk/speex/libspeex/fftwrap.c
===================================================================
--- trunk/speex/libspeex/fftwrap.c	2008-05-27 11:12:08 UTC (rev 14966)
+++ trunk/speex/libspeex/fftwrap.c	2008-05-27 13:01:33 UTC (rev 14967)
@@ -201,6 +201,7 @@
   iptr[1] = 0.0f;
   for(i=1;i<N;++i)
     iptr[i+1] = in[i];
+  iptr[N+1] = 0.0f;
 
   fftwf_execute(t->ifft);