[xiph-commits] r10674 - trunk/speex/libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2005-12-22 03:16:04 -0800 (Thu, 22 Dec 2005)
New Revision: 10674

Modified:
   trunk/speex/libspeex/kiss_fft.c
   trunk/speex/libspeex/kiss_fft.h
Log:
some bugfixes


Modified: trunk/speex/libspeex/kiss_fft.c
===================================================================
--- trunk/speex/libspeex/kiss_fft.c	2005-12-22 11:14:42 UTC (rev 10673)
+++ trunk/speex/libspeex/kiss_fft.c	2005-12-22 11:16:04 UTC (rev 10674)
@@ -371,7 +371,7 @@
     if ( lenmem==NULL ) {
         st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded );
     }else{
-        if (*lenmem >= memneeded)
+        if (mem != NULL && *lenmem >= memneeded)
             st = (kiss_fft_cfg)mem;
         *lenmem = memneeded;
     }

Modified: trunk/speex/libspeex/kiss_fft.h
===================================================================
--- trunk/speex/libspeex/kiss_fft.h	2005-12-22 11:14:42 UTC (rev 10673)
+++ trunk/speex/libspeex/kiss_fft.h	2005-12-22 11:16:04 UTC (rev 10674)
@@ -35,11 +35,7 @@
 
 #ifdef FIXED_POINT
 #include <sys/types.h>	
-# if (FIXED_POINT == 32)
-#  define kiss_fft_scalar int32_t
-# else	
 #  define kiss_fft_scalar int16_t
-# endif
 #else
 # ifndef kiss_fft_scalar
 /*  default is float */