[Sox-commits] sox/src effects.c,1.47,1.48 fft4g.c,1.3,1.4

[robs <ro...@us...>]

Update of /cvsroot/sox/sox/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15445/src

Modified Files:
	effects.c fft4g.c 
Log Message:
fix gomp fft crash

Index: fft4g.c
===================================================================
RCS file: /cvsroot/sox/sox/src/fft4g.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fft4g.c	25 Apr 2009 10:29:45 -0000	1.3
+++ fft4g.c	25 Apr 2009 12:16:26 -0000	1.4
@@ -706,9 +706,9 @@
 /* -------- child routines -------- */
 
 
-static void bitrv2(int n, int *ip, double *a)
+static void bitrv2(int n, int *ip0, double *a)
 {
-    int j, j1, k, k1, l, m, m2;
+    int j, j1, k, k1, l, m, m2, ip[256];
     double xr, xi, yr, yi;
     
     ip[0] = 0;
@@ -806,9 +806,9 @@
 }
 
 
-static void bitrv2conj(int n, int *ip, double *a)
+static void bitrv2conj(int n, int *ip0, double *a)
 {
-    int j, j1, k, k1, l, m, m2;
+    int j, j1, k, k1, l, m, m2, ip[256];
     double xr, xi, yr, yi;
     
     ip[0] = 0;

Index: effects.c
===================================================================
RCS file: /cvsroot/sox/sox/src/effects.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- effects.c	18 Mar 2009 17:47:19 -0000	1.47
+++ effects.c	25 Apr 2009 12:16:26 -0000	1.48
@@ -198,7 +198,7 @@
 {
   sox_effect_t * effp1 = &chain->effects[n - 1][0];
   sox_effect_t * effp = &chain->effects[n][0];
-  int effstatus = SOX_SUCCESS, f;
+  int effstatus = SOX_SUCCESS, f = 0;
   size_t i;
   const sox_sample_t *ibuf;
   size_t idone = effp1->oend - effp1->obeg;
@@ -233,9 +233,14 @@
         lsx_fail("flowed asymmetrically!");
         effstatus = SOX_EOF;
       }
-#endif
       idone_last = idonec;
       odone_last = odonec;
+#else
+      if (!f) {
+        idone_last = idonec;
+        odone_last = odonec;
+      }
+#endif
 
       if (eff_status_c != SOX_SUCCESS)
         effstatus = SOX_EOF;
@@ -245,8 +250,8 @@
       for (f = 0; f < (int)effp->flows; ++f)
         *obuf++ = chain->obufc[f][i];
 
-    idone = f * idone_last;
-    obeg = f * odone_last;
+    idone = effp->flows * idone_last;
+    obeg = effp->flows * odone_last;
   }
 #if DEBUG_EFFECTS_CHAIN
   lsx_report("flow:  %5u%5u%5u%5u", pre_idone, pre_odone, idone, obeg);