Mercurial > hg > octave-nkf
changeset 19537:8f6a8422435d
Replace instances of deprecated Array constructor in FFTPACK-related code.
* dNDArray.cc (fourier, ifourier, fourier2d, ifourier2d, fourierNd,
ifourierNd): Use Array constructor with dim_vector input.
* fNDArray.cc (fourier, ifourier, fourier2d, ifourier2d, fourierNd,
ifourierNd): Use Array constructor with dim_vector input.
* fCNDArray.cc (fourier, ifourier, fourier2d, ifourier2d, fourierNd,
ifourierNd): Use Array constructor with dim_vector input.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 22 Nov 2014 12:35:08 -0800 |
parents | 718aaf1e84f7 |
children | eb90f921bbc0 |
files | liboctave/array/dNDArray.cc liboctave/array/fCNDArray.cc liboctave/array/fNDArray.cc |
diffstat | 3 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/dNDArray.cc +++ b/liboctave/array/dNDArray.cc @@ -257,7 +257,7 @@ ComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (Complex, tmp, npts); @@ -304,7 +304,7 @@ ComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (Complex, tmp, npts); @@ -354,9 +354,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); - Array<Complex> row (npts); + Array<Complex> row (dim_vector (npts, 1)); Complex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -402,9 +402,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); - Array<Complex> row (npts); + Array<Complex> row (dim_vector (npts, 1)); Complex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -450,9 +450,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); - Array<Complex> row (npts); + Array<Complex> row (dim_vector (npts, 1)); Complex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -497,9 +497,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<Complex> wsave (nn); + Array<Complex> wsave (dim_vector (nn, 1)); Complex *pwsave = wsave.fortran_vec (); - Array<Complex> row (npts); + Array<Complex> row (dim_vector (npts, 1)); Complex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts;
--- a/liboctave/array/fCNDArray.cc +++ b/liboctave/array/fCNDArray.cc @@ -214,7 +214,7 @@ FloatComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (FloatComplex, tmp, npts); @@ -261,7 +261,7 @@ FloatComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (FloatComplex, tmp, npts); @@ -311,9 +311,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts, 1); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -359,9 +359,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts, 1); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -407,9 +407,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts, 1); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -454,9 +454,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn, 1); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts, 1); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts;
--- a/liboctave/array/fNDArray.cc +++ b/liboctave/array/fNDArray.cc @@ -217,7 +217,7 @@ FloatComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (FloatComplex, tmp, npts); @@ -264,7 +264,7 @@ FloatComplexNDArray retval (dv); octave_idx_type npts = dv(dim); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); OCTAVE_LOCAL_BUFFER (FloatComplex, tmp, npts); @@ -314,9 +314,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -362,9 +362,9 @@ { octave_idx_type npts = dv2(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -410,9 +410,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts; @@ -457,9 +457,9 @@ { octave_idx_type npts = dv(i); octave_idx_type nn = 4*npts+15; - Array<FloatComplex> wsave (nn); + Array<FloatComplex> wsave (dim_vector (nn, 1)); FloatComplex *pwsave = wsave.fortran_vec (); - Array<FloatComplex> row (npts); + Array<FloatComplex> row (dim_vector (npts, 1)); FloatComplex *prow = row.fortran_vec (); octave_idx_type howmany = numel () / npts;