Changeset 4316 for trunk/psLib/src/fft

Timestamp:

Jun 17, 2005, 5:13:02 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/fft

Files:

• psImageFFT.c (modified) (6 diffs)
• psImageFFT.h (modified) (2 diffs)

trunk/psLib/src/fft/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 21:17:45 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 03:13:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 static psBool p_fftwWisdomImported = false;
 
-psImage* psImageFFT(psImage* out, const psImage* in, psFFTFlags direction)
+psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction)
 {
     psU32 numCols;
@@ -35 +35 @@
 
     /* got good image data? */
-    if (in == NULL) {
+    if (image == NULL) {
         psFree(out);
         return NULL;
@@ -60 +60 @@
     }
 
-    type = in->type.type;
+    type = image->type.type;
 
     /* make sure the system-level wisdom information is imported. */
@@ -68 +68 @@
     }
 
-    numRows = in->numRows;
-    numCols = in->numCols;
+    numRows = image->numRows;
+    numCols = image->numCols;
 
     // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place.
@@ -75 +75 @@
 
     fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex));
-    p_psImageCopyToRawBuffer(outBuffer, in, PS_TYPE_C32);
+    p_psImageCopyToRawBuffer(outBuffer, image, PS_TYPE_C32);
 
     plan = fftwf_plan_dft_2d(numRows, numCols,

trunk/psLib/src/fft/psImageFFT.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 03:13:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 psImage* psImageFFT(
     psImage* out,                      ///< a psImage to recycle.  If NULL, a new psImage is made.
-    const psImage* in,                 ///< the psImage to apply transform to
+    const psImage* image,                 ///< the psImage to apply transform to
     psFFTFlags direction               ///< the direction of the transform
 );