Index: trunk/psLib/src/fft/psImageFFT.c
===================================================================
--- trunk/psLib/src/fft/psImageFFT.c	(revision 2080)
+++ trunk/psLib/src/fft/psImageFFT.c	(revision 2204)
@@ -5,11 +5,10 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-06 21:31:30 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 #include <unistd.h>
-#include <stdbool.h>
 #include <string.h>
 #include <complex.h>
@@ -27,10 +26,10 @@
 #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE
 
-static bool p_fftwWisdomImported = false;
+static psBool p_fftwWisdomImported = false;
 
 psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction)
 {
-    unsigned int numCols;
-    unsigned int numRows;
+    psU32 numCols;
+    psU32 numRows;
     psElemType type;
     fftwf_plan plan;
@@ -77,5 +76,5 @@
 
     // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place.
-    int sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD;
+    psS32 sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD;
     out = psImageCopy(out, in, PS_TYPE_C32);
     plan = fftwf_plan_dft_2d(numCols, numRows,
@@ -118,6 +117,6 @@
 {
     psElemType type;
-    unsigned int numCols;
-    unsigned int numRows;
+    psU32 numCols;
+    psU32 numRows;
 
     if (in == NULL) {
@@ -140,9 +139,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F32[row];
             inRow = in->data.C32[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = crealf(inRow[col]);
             }
@@ -153,9 +152,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F64[row];
             inRow = in->data.C64[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = creal(inRow[col]);
             }
@@ -179,6 +178,6 @@
 {
     psElemType type;
-    unsigned int numCols;
-    unsigned int numRows;
+    psU32 numCols;
+    psU32 numRows;
 
     if (in == NULL) {
@@ -203,9 +202,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F32[row];
             inRow = in->data.C32[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = cimagf(inRow[col]);
             }
@@ -216,9 +215,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F64[row];
             inRow = in->data.C64[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = cimag(inRow[col]);
             }
@@ -241,6 +240,6 @@
 {
     psElemType type;
-    unsigned int numCols;
-    unsigned int numRows;
+    psU32 numCols;
+    psU32 numRows;
 
     if (real == NULL || imag == NULL) {
@@ -282,10 +281,10 @@
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32);
 
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.C32[row];
             realRow = real->data.F32[row];
             imagRow = imag->data.F32[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = realRow[col] + I * imagRow[col];
             }
@@ -297,10 +296,10 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.C64[row];
             realRow = real->data.F64[row];
             imagRow = imag->data.F64[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = realRow[col] + I * imagRow[col];
             }
@@ -324,6 +323,6 @@
 {
     psElemType type;
-    unsigned int numCols;
-    unsigned int numRows;
+    psU32 numCols;
+    psU32 numRows;
 
     if (in == NULL) {
@@ -346,9 +345,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.C32[row];
             inRow = in->data.C32[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = crealf(inRow[col]) - I * cimagf(inRow[col]);
             }
@@ -359,9 +358,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.C64[row];
             inRow = in->data.C64[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 outRow[col] = creal(inRow[col]) - I * cimag(inRow[col]);
             }
@@ -384,7 +383,7 @@
 {
     psElemType type;
-    unsigned int numCols;
-    unsigned int numRows;
-    int numElementsSquared;
+    psU32 numCols;
+    psU32 numRows;
+    psS32 numElementsSquared;
 
     if (in == NULL) {
@@ -405,9 +404,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F32[row];
             inRow = in->data.C32[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 real = crealf(inRow[col]);
                 imag = cimagf(inRow[col]);
@@ -422,9 +421,9 @@
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64);
-        for (unsigned int row = 0; row < numRows; row++) {
+        for (psU32 row = 0; row < numRows; row++) {
             outRow = out->data.F64[row];
             inRow = in->data.C64[row];
 
-            for (unsigned int col = 0; col < numCols; col++) {
+            for (psU32 col = 0; col < numCols; col++) {
                 real = creal(inRow[col]);
                 imag = cimag(inRow[col]);
Index: trunk/psLib/src/fft/psVectorFFT.c
===================================================================
--- trunk/psLib/src/fft/psVectorFFT.c	(revision 2080)
+++ trunk/psLib/src/fft/psVectorFFT.c	(revision 2204)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 20:46:57 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,9 +27,9 @@
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
 
-static bool p_fftwWisdomImported = false;
+static psBool p_fftwWisdomImported = false;
 
 psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction)
 {
-    unsigned int numElements;
+    psU32 numElements;
     psElemType type;
     fftwf_plan plan;
@@ -85,5 +85,5 @@
 
     if ((direction & PS_FFT_REAL_RESULT) != 0) {
-        for (int i = 0; i < numElements; i++) {
+        for (psS32 i = 0; i < numElements; i++) {
             out->data.F32[i] = out->data.C32[i];
         }
@@ -98,5 +98,5 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -127,5 +127,5 @@
         outVec = out->data.F32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = crealf(inVec[i]);
         }
@@ -138,5 +138,5 @@
         outVec = out->data.F64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = creal(inVec[i]);
         }
@@ -158,5 +158,5 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -187,5 +187,5 @@
         outVec = out->data.F32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = cimagf(inVec[i]);
         }
@@ -198,5 +198,5 @@
         outVec = out->data.F64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = cimag(inVec[i]);
         }
@@ -218,5 +218,5 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (real == NULL || imag == NULL) {
@@ -254,5 +254,5 @@
         outVec = out->data.C32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = realVec[i] + I * imagVec[i];
         }
@@ -266,5 +266,5 @@
         outVec = out->data.C64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = realVec[i] + I * imagVec[i];
         }
@@ -286,5 +286,5 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -316,5 +316,5 @@
         outVec = out->data.C32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = crealf(inVec[i]) - I * cimagf(inVec[i]);
         }
@@ -327,5 +327,5 @@
         outVec = out->data.C64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = creal(inVec[i]) - I * cimag(inVec[i]);
         }
@@ -347,8 +347,8 @@
 {
     psElemType type;
-    unsigned int outNumElements;
-    unsigned int inNumElements;
-    unsigned int inHalfNumElements;
-    unsigned int inNumElementsSquared;
+    psU32 outNumElements;
+    psU32 inNumElements;
+    psU32 inHalfNumElements;
+    psU32 inNumElementsSquared;
 
     if (in == NULL) {
@@ -378,5 +378,5 @@
 
         // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1)
-        for (unsigned int i = 1; i < inHalfNumElements; i++) {
+        for (psU32 i = 1; i < inHalfNumElements; i++) {
             inAbs1 = cabsf(inVec[i]);
             inAbs2 = cabsf(inVec[inNumElements - i]);
@@ -402,5 +402,5 @@
 
         // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1)
-        for (unsigned int i = 1; i < inHalfNumElements; i++) {
+        for (psU32 i = 1; i < inHalfNumElements; i++) {
             inAbs1 = cabs(inVec[i]);
             inAbs2 = cabs(inVec[inNumElements - i]);