# HG changeset patch
# User jwe
# Date 1097512312 0
# Node ID 50140aa23b32f1e4a338f785725cdf746ed8fe09
# Parent  a0da258f64e6faeb2f261e6465369e35735ac5a7
[project @ 2004-10-11 16:31:51 by jwe]

diff -r a0da258f64e6 -r 50140aa23b32 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Oct 06 13:37:10 2004 +0000
+++ b/liboctave/ChangeLog	Mon Oct 11 16:31:52 2004 +0000
@@ -1,3 +1,10 @@
+2004-10-11  David Bateman <dbateman@free.fr>
+
+	* oct-fftw.cc (class octave_fftw_planner): Add inplace[2] to
+	flag whether transform in- or out-of-place.
+	(octave_fftw_planner::octave_fftw_planner): Initialize it.
+	(octave_fftw_planner::create_plan): Use it.
+
 2004-09-24  John W. Eaton  <jwe@octave.org>
 
 	* Array.cc (assign2, assignN): If index is empty, allow RHS to be
diff -r a0da258f64e6 -r 50140aa23b32 liboctave/oct-fftw.cc
--- a/liboctave/oct-fftw.cc	Wed Oct 06 13:37:10 2004 +0000
+++ b/liboctave/oct-fftw.cc	Mon Oct 11 16:31:52 2004 +0000
@@ -89,7 +89,7 @@
   dim_vector n[2];
 
   bool simd_align[2];
-
+  bool inplace[2];
 
   // Plan for fft of real values
   fftw_plan rplan;
@@ -119,13 +119,14 @@
   plan[0] = plan[1] = 0;
   d[0] = d[1] = s[0] = s[1] = r[0] = r[1] = h[0] = h[1] = 0;
   simd_align[0] = simd_align[1] = false;
+  inplace[0] = inplace[1] = false;
   n[0] = n[1] = dim_vector ();
 
   rplan = 0;
   rd = rs = rr = rh = 0;
   rsimd_align = false;
   rn = dim_vector ();
-
+  
   // If we have a system wide wisdom file, import it.
   fftw_import_system_wisdom ();
 }
@@ -143,13 +144,15 @@
   fftw_plan *cur_plan_p = &plan[which];
   bool create_new_plan = false;
   bool ioalign = CHECK_SIMD_ALIGNMENT (in) && CHECK_SIMD_ALIGNMENT (out);
+  bool ioinplace = (in == out);
 
   // Don't create a new plan if we have a non SIMD plan already but
   // can do SIMD.  This prevents endlessly recreating plans if we
   // change the alignment.
 
   if (plan[which] == 0 || d[which] != dist || s[which] != stride
-      || r[which] != rank || h[which] != howmany
+      || r[which] != rank || h[which] != howmany 
+      || ioinplace != inplace[which]
       || ((ioalign != simd_align[which]) ? !ioalign : false))
     create_new_plan = true;
   else
@@ -171,6 +174,7 @@
       r[which] = rank;
       h[which] = howmany;
       simd_align[which] = ioalign;
+      inplace[which] = ioinplace;
       n[which] = dims;
 
       if (ioalign)