X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fimagefile.cpp;h=c21c17f6858facaa7114cd9a92e90b9667dbc35b;hb=32f6cb0e279bb25a06f025676b5513ab792e734c;hp=0b7eb8192f94690020e16dc0135c5f1e1c3b949c;hpb=60de4f91316c2c991d6310ada775c3b926f560e3;p=ctsim.git diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index 0b7eb81..c21c17f 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: imagefile.cpp,v 1.30 2001/01/02 07:18:07 kevin Exp $ +** $Id: imagefile.cpp,v 1.31 2001/01/02 08:15:02 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -866,26 +866,16 @@ ImageFile::fourier (ImageFile& result) const complexOut[ix] = new CTSimComplex [m_ny]; // fourier each x column -#if 1 CTSimComplex* pY = new CTSimComplex [m_ny]; for (ix = 0; ix < m_nx; ix++) { for (iy = 0; iy < m_ny; iy++) { double dImag = 0; if (isComplex()) dImag = vLHSImag[ix][iy]; - pY[iy] = complex(vLHS[ix][iy], dImag); + pY[iy] = std::complex(vLHS[ix][iy], dImag); } ProcessSignal::finiteFourierTransform (pY, complexOut[ix], m_ny, ProcessSignal::FORWARD); } -#else - double* pY = new double [m_ny]; - for (ix = 0; ix < m_nx; ix++) { - for (iy = 0; iy < m_ny; iy++) { - pY[iy] = vLHS[ix][iy]; - } - ProcessSignal::finiteFourierTransform (pY, complexOut[ix], m_ny, ProcessSignal::FORWARD); - } -#endif delete [] pY; // fourier each y row