Changeset 11704

Timestamp:

Feb 7, 2007, 6:23:57 PM (19 years ago)

Author:

Paul Price

Message:

Fixes so it compiles. psVector FFTs don't work yet --- need to fix N/2 problem, in the same manner as psImage FFTs.

Location:

trunk/psLib/src

Files:

• fft/psImageFFT.h (modified) (2 diffs)
• fft/psVectorFFT.c (modified) (2 diffs)
• fft/psVectorFFT.h (modified) (2 diffs)
• imageops/psImageConvolve.c (modified) (2 diffs)

trunk/psLib/src/fft/psImageFFT.h

@@ -5 +5 @@
 /// @author Robert DeSonia, MHPCC
 ///
-/// @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-02-08 04:17:58 $
+/// @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-02-08 04:23:57 $
 /// Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
 ///
@@ -54 +54 @@
 /// of the output image are returned.  Only implemented for F32 input.
 bool psImageComplexMultiply(psImage **outReal, ///< Real part of output
-                            psimage **outImag, ///< Imaginary part of output
+                            psImage **outImag, ///< Imaginary part of output
                             const psImage *in1Real, ///< Real part of input 1
                             const psImage *in1Imag, ///< Imaginary part of input 1

trunk/psLib/src/fft/psVectorFFT.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-08 04:17:58 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 04:23:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
 }
 
-bool psVectorBackwardFFT(psVector **out, const psVector *real, const psVector *imag)
+bool psVectorBackwardFFT(psVector **out, const psVector *real, const psVector *imag, long origNum)
 {
     PS_ASSERT_VECTOR_NON_NULL(real, false);

trunk/psLib/src/fft/psVectorFFT.h

@@ -5 +5 @@
 /// @author Robert DeSonia, MHPCC
 ///
-/// @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-02-08 04:17:58 $
+/// @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-02-08 04:23:57 $
 /// Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
 ///
@@ -40 +40 @@
                          const psVector *real, ///< Real input (F32)
                          const psVector *imag, ///< Imaginary input (F32)
-                         int origN      ///< Original number of elements
+                         long origNum    ///< Original number of elements
     );
 

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-02-08 04:17:58 $
+/// @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-02-08 04:23:57 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -231 +231 @@
         SPATIAL_CONVOLVE_CASE(F64);
       default:
-        psAbort(PS_FILE_LINE, "Should never get here: bad type that was asserted on previously.");
+        psAbort("Should never get here: bad type that was asserted on previously.");
     }