Mercurial > octave-nkf

changeset 11509:fc35194006d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oct-fftw.cc: more constructor tweaks
author John W. Eaton <jwe@octave.org>
date Thu, 13 Jan 2011 06:20:33 -0500
parents 41866901ec62
children f3d0b69c4628
files liboctave/ChangeLog liboctave/oct-fftw.cc
diffstat 2 files changed, 10 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Thu Jan 13 06:02:52 2011 -0500
+++ b/liboctave/ChangeLog	Thu Jan 13 06:20:33 2011 -0500
@@ -1,3 +1,10 @@
+2011-01-13  John W. Eaton  <jwe@octave.org>
+
+	* oct-fftw.cc (octave_fftw_planner::octave_fftw_planner,
+	octave_float_fftw_planner::octave_float_fftw_planner):
+	Avoid duplicate initializations.  Correctly initialize RN to
+	empty dim_vector.
+
 2011-01-13  John W. Eaton  <jwe@octave.org>
 
 	* Sparse.cc (Sparse::Sparse): Initialize all data members in
--- a/liboctave/oct-fftw.cc	Thu Jan 13 06:02:52 2011 -0500
+++ b/liboctave/oct-fftw.cc	Thu Jan 13 06:20:33 2011 -0500
@@ -56,21 +56,14 @@
 // ffts.
 
 octave_fftw_planner::octave_fftw_planner (void)
-  : meth (), rplan (), rd (0), rs (0), rr (0), rh (0), rn (0),
+  : meth (ESTIMATE), rplan (0), rd (0), rs (0), rr (0), rh (0), rn (),
     rsimd_align (false)
 {
-  meth = ESTIMATE;
-
   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 ();
@@ -371,22 +364,15 @@
 octave_float_fftw_planner *octave_float_fftw_planner::instance = 0;
 
 octave_float_fftw_planner::octave_float_fftw_planner (void)
-  : meth (), rplan (), rd (0), rs (0), rr (0), rh (0), rn (0),
+  : meth (ESTIMATE), rplan (0), rd (0), rs (0), rr (0), rh (0), rn (),
     rsimd_align (false)
 {
-  meth = ESTIMATE;
-
   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.
   fftwf_import_system_wisdom ();
 }