# HG changeset patch
# User jwe
# Date 1076958800 0
# Node ID 0ff45249d3219889793285c19a854c00959e1aa3
# Parent  ccfbd6047a540b272b3ba1443d5bc76cc350f35e
[project @ 2004-02-16 19:13:20 by jwe]

diff -r ccfbd6047a54 -r 0ff45249d321 liboctave/oct-fftw.cc
--- a/liboctave/oct-fftw.cc	Mon Feb 16 19:02:33 2004 +0000
+++ b/liboctave/oct-fftw.cc	Mon Feb 16 19:13:20 2004 +0000
@@ -107,8 +107,8 @@
   int which = (dir == FFTW_FORWARD) ? 0 : 1;
   fftw_plan *cur_plan_p = &plan[which];
   bool create_new_plan = false;
-  char in_align = ((int) in) & 0xF;
-  char out_align = ((int) out) & 0xF;
+  char in_align = (static_cast<int> (in)) & 0xF;
+  char out_align = (static_cast<int (out)) & 0xF;
 
   if (plan[which] == 0 || d[which] != dist || s[which] != stride ||
       r[which] != rank || h[which] != howmany ||
@@ -144,8 +144,8 @@
       *cur_plan_p =
 	fftw_plan_many_dft (rank, tmp, howmany,
 	      reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)),
-	      NULL, stride, dist, reinterpret_cast<fftw_complex *> (out),
-	      NULL, stride, dist, dir, plan_flags);
+	      0, stride, dist, reinterpret_cast<fftw_complex *> (out),
+	      0, stride, dist, dir, plan_flags);
 
       if (*cur_plan_p == 0)
 	(*current_liboctave_error_handler) ("Error creating fftw plan");
@@ -161,8 +161,8 @@
 {
   fftw_plan *cur_plan_p = &rplan;
   bool create_new_plan = false;
-  char in_align = ((int) in) & 0xF;
-  char out_align = ((int) out) & 0xF;
+  char in_align = (static_cast<int> (in)) & 0xF;
+  char out_align = (static_cast<int (out)) & 0xF;
 
   if (rplan == 0 || rd != dist || rs != stride ||
       rr != rank || rh != howmany ||
@@ -198,8 +198,8 @@
       *cur_plan_p =
 	fftw_plan_many_dft_r2c (rank, tmp, howmany,
 	      (const_cast<double *> (in)),
-	      NULL, stride, dist, reinterpret_cast<fftw_complex *> (out),
-	      NULL, stride, dist, plan_flags);
+	      0, stride, dist, reinterpret_cast<fftw_complex *> (out),
+	      0, stride, dist, plan_flags);
 
       if (*cur_plan_p == 0)
 	(*current_liboctave_error_handler) ("Error creating fftw plan");