From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 5 Jul 2000 17:59:26 +0000 (+0000)
Subject: r135: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~882
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=cabc5359e111e9d8a9554263ece8e51d8de1ef86

r135: *** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 95dcfb4..c32573b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
    Added option processing for filter-method for pjrec to choose
 	between convolution, dft, & fft filtering
    Fixed format string for EZPlot so axis labels now print
+   Added support for FFTW library
 	
 1.9.8 - 6/27/2000
    Rewrote Array2dFile class to be non-templated
diff --git a/INSTALL b/INSTALL
index 086d8b3..f134ef0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,6 +12,9 @@ libpng (ftp://ftp.uu.net/graphics/png/src)
   Version 1.0.3 or greater is required. Version 0.89 definitely will
   not work.
 
+fftw (http://www.fftw.org)
+  Fastest Fourier Transform in the West
+
 lam (http://www.mpi.nd.edu/lam/)
   There is support is MPI clustering. I use this code at home for my
   beowulf cluster.
diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp
index 2d31525..978a502 100644
--- a/libctsim/filter.cpp
+++ b/libctsim/filter.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filter.cpp,v 1.11 2000/07/05 17:24:33 kevin Exp $
+**  $Id: filter.cpp,v 1.12 2000/07/05 17:59:26 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
@@ -370,6 +370,7 @@ SignalFilter::filterSignal (const float input[], double output[]) const
     for (int i = 0; i < m_nSignalPoints; i++) 
       output[i] = complexOutput[i].real();
   } else if (m_idFilterMethod == FILTER_METHOD_FFT || FILTER_METHOD_FFT_ZEROPAD_2 || FILTER_METHOD_FFT_ZEROPAD_4) {
+#if HAVE_FFTW
     fftw_complex in[m_nFilterPoints], out[m_nFilterPoints];
     for (int i = 0; i < m_nSignalPoints; i++) {
       in[i].re = input[i];
@@ -387,6 +388,7 @@ SignalFilter::filterSignal (const float input[], double output[]) const
     for (int i = 0; i < m_nSignalPoints; i++) 
       output[i] = in[i].re;
   }
+#endif
 }
 
 double