Index: trunk/psLib/src/dataManip/psFFT.c
===================================================================
--- trunk/psLib/src/dataManip/psFFT.c	(revision 1010)
+++ trunk/psLib/src/dataManip/psFFT.c	(revision 1073)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 02:17:25 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,5 +35,5 @@
     /* got good image data? */
     if (in==NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -44,5 +44,5 @@
         psError(__func__,"Input image must be a 32-bit float or complex image (type=%d)",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -51,5 +51,5 @@
         psError(__func__,"Input image must be complex image for reverse FFT (type=%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
 
@@ -76,5 +76,5 @@
     if (plan == NULL) {
         psError(__func__,"Failed to create FFTW plan.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -98,5 +98,5 @@
 
     if (in == NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -143,5 +143,5 @@
         psError(__func__,"Can not extract real component from given image type (%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -158,5 +158,5 @@
 
     if (in == NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -205,5 +205,5 @@
         psError(__func__,"Can not extract imaginary component from given image type (%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -220,5 +220,5 @@
 
     if (real == NULL || imag == NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -230,5 +230,5 @@
     if (imag->type.type != type) {
         psError(__func__,"The inputs to psImageComplex must be the same type.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -237,5 +237,5 @@
             imag->numRows != numRows) {
         psError(__func__,"The inputs to psImageComplex must be the same dimensions.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -243,5 +243,5 @@
     if (PS_IS_PSELEMTYPE_COMPLEX(type)) {
         psError(__func__,"The inputs to psImageComplex can not be complex.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -249,5 +249,5 @@
     if (type != PS_TYPE_F32 && type != PS_TYPE_F64) {
         psError(__func__,"The input type to psImageComplex must be a floating point.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -287,5 +287,5 @@
         psError(__func__,"Can not merge real and imaginary portions for given image type (%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -302,5 +302,5 @@
 
     if (in == NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -347,5 +347,5 @@
         psError(__func__,"Can not compute complex conjugate for given image type (%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -362,5 +362,5 @@
 
     if (in == NULL) {
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -374,5 +374,5 @@
     if (! PS_IS_PSELEMTYPE_COMPLEX(type)) {
         psError(__func__,"Power Spectrum for non-complex inputs is not implemented.");
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -417,5 +417,5 @@
         psError(__func__,"Can not power spectrum for given image type (%d).",
                 type);
-        psImageFree(out);
+        psFree(out);
         return NULL;
     }
@@ -435,5 +435,5 @@
     /* got good image data? */
     if (in==NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -444,5 +444,5 @@
         psError(__func__,"Input image must be a 32-bit float or complex image (type=%d)",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -451,5 +451,5 @@
         psError(__func__,"Input image must be complex image for reverse FFT (type=%d).",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
 
@@ -491,5 +491,5 @@
     if (plan == NULL) {
         psError(__func__,"Failed to create FFTW plan.");
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -510,5 +510,5 @@
 
     if (in == NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -542,5 +542,5 @@
         psError(__func__,"Can not extract real component from given vector type (%d).",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -556,5 +556,5 @@
 
     if (in == NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -588,5 +588,5 @@
         psError(__func__,"Can not extract imaginary component from given vector type (%d).",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -602,5 +602,5 @@
 
     if (real == NULL || imag == NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -615,5 +615,5 @@
     if (imag->type.type != type) {
         psError(__func__,"The inputs to psVectorComplex must be the same type.");
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -621,5 +621,5 @@
     if (PS_IS_PSELEMTYPE_COMPLEX(type)) {
         psError(__func__,"The inputs to psVectorComplex can not be complex.");
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -640,5 +640,5 @@
         psError(__func__,"Can not merge real and imaginary portions for given vector type (%d).",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -654,5 +654,5 @@
 
     if (in == NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -687,5 +687,5 @@
         psError(__func__,"Can not compute complex conjugate for given vector type (%d).",
                 type);
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -703,5 +703,5 @@
 
     if (in == NULL) {
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -716,5 +716,5 @@
     if (! PS_IS_PSELEMTYPE_COMPLEX(type)) {
         psError(__func__,"Power Spectrum for non-complex inputs is not implemented.");
-        psVectorFree(out);
+        psFree(out);
         return NULL;
     }
@@ -747,9 +747,9 @@
         psError(__func__,"Can not power spectrum for given vector type (%d).",
                 type);
-        psVectorFree(out);
-        return NULL;
-    }
-
-    return out;
-
-}
+        psFree(out);
+        return NULL;
+    }
+
+    return out;
+
+}