Mercurial > hg > octave-nkf
changeset 4775:88b638195bd1
[project @ 2004-02-16 19:57:06 by jwe]
| author | jwe |
|---|---|
| date | Mon, 16 Feb 2004 19:57:06 +0000 |
| parents | 0ff45249d321 |
| children | adf8d68d7143 |
| files | liboctave/oct-fftw.cc src/ChangeLog src/version.h |
| diffstat | 3 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/oct-fftw.cc +++ b/liboctave/oct-fftw.cc @@ -24,9 +24,11 @@ #if defined (HAVE_FFTW3) +#include <iostream> +#include <vector> + #include "oct-fftw.h" #include "lo-error.h" -#include <iostream> // Helper class to create and cache fftw plans for both 1d and 2d. This // implementation uses FFTW_ESTIMATE to create the plans, which in theory @@ -107,8 +109,8 @@ int which = (dir == FFTW_FORWARD) ? 0 : 1; fftw_plan *cur_plan_p = &plan[which]; bool create_new_plan = false; - char in_align = (static_cast<int> (in)) & 0xF; - char out_align = (static_cast<int (out)) & 0xF; + char in_align = (X_CAST (int, in)) & 0xF; + char out_align = (X_CAST (int, out)) & 0xF; if (plan[which] == 0 || d[which] != dist || s[which] != stride || r[which] != rank || h[which] != howmany || @@ -161,8 +163,8 @@ { fftw_plan *cur_plan_p = &rplan; bool create_new_plan = false; - char in_align = (static_cast<int> (in)) & 0xF; - char out_align = (static_cast<int (out)) & 0xF; + char in_align = (X_CAST (int, in)) & 0xF; + char out_align = (X_CAST (int, out)) & 0xF; if (rplan == 0 || rd != dist || rs != stride || rr != rank || rh != howmany || @@ -210,8 +212,9 @@ static octave_fftw_planner fftw_planner; -static inline void convert_packcomplex_1d (Complex *out, size_t nr, - size_t nc, int stride, int dist) +static inline void +convert_packcomplex_1d (Complex *out, size_t nr, size_t nc, + int stride, int dist) { // Fill in the missing data for (size_t i = 0; i < nr; i++) @@ -219,8 +222,8 @@ out[j*stride + i*dist] = conj(out[(nc - j)*stride + i*dist]); } -static inline void convert_packcomplex_Nd (Complex *out, - const dim_vector &dv) +static inline void +convert_packcomplex_Nd (Complex *out, const dim_vector &dv) { size_t nc = dv(0); size_t nr = dv(1);
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-02-16 John W. Eaton <jwe@bevo.che.wisc.edu> + + * version.h (OCTAVE_VERSION): Now 2.1.54. + (OCTAVE_API_VERSION): Now api-v5. + 2004-02-16 David Bateman <dbateman@free.fr> * DLD-FUNCTIONS/fft.cc: Adapt for Nd arrays, combine with ifft.cc.
--- a/src/version.h +++ b/src/version.h @@ -23,9 +23,9 @@ #if !defined (octave_version_h) #define octave_version_h 1 -#define OCTAVE_VERSION "2.1.53" +#define OCTAVE_VERSION "2.1.54" -#define OCTAVE_API_VERSION "api-v4" +#define OCTAVE_API_VERSION "api-v5" #define OCTAVE_COPYRIGHT \ "Copyright (C) 2004 John W. Eaton."