Index: trunk/psLib/test/image/tst_psImageFFT.c
===================================================================
--- trunk/psLib/test/image/tst_psImageFFT.c	(revision 2078)
+++ trunk/psLib/test/image/tst_psImageFFT.c	(revision 2204)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 19:50:12 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,16 +20,16 @@
 #define GENIMAGE(img,c,r,TYP, valueFcn) \
 img = psImageAlloc(c,r,PS_TYPE_##TYP); \
-for (unsigned int row=0;row<r;row++) { \
+for (psU32 row=0;row<r;row++) { \
     ps##TYP* imgRow = img->data.TYP[row]; \
-    for (unsigned int col=0;col<c;col++) { \
+    for (psU32 col=0;col<c;col++) { \
         imgRow[col] = (ps##TYP)(valueFcn); \
     } \
 }
 
-static int testImageFFT(void);
-static int testImageRealImaginary(void);
-static int testImageComplex(void);
-static int testImageConjugate(void);
-static int testImagePowerSpectrum(void);
+static psS32 testImageFFT(void);
+static psS32 testImageRealImaginary(void);
+static psS32 testImageComplex(void);
+static psS32 testImageConjugate(void);
+static psS32 testImagePowerSpectrum(void);
 
 testDescription tests[] = {
@@ -54,5 +54,5 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -61,11 +61,11 @@
 }
 
-int testImageFFT(void)
+psS32 testImageFFT(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
     psImage* img3 = NULL;
-    unsigned int m = 128;
-    unsigned int n = 64;
+    psU32 m = 128;
+    psU32 n = 64;
     psImage* img4 = NULL;
     psImage* img5 = NULL;
@@ -95,7 +95,7 @@
 
     // 3. verify that the only significant component cooresponds to the freqency of the input in step 1.
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psC32* img2Row = img2->data.C32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             psF32 mag = cabsf(img2Row[col])/m/n;
             if (mag > 0.1f) {
@@ -130,8 +130,8 @@
     }
 
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psC32* img3Row = img3->data.C32[row];
         psF32* imgRow = img->data.F32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             psF32 pixel = creal(img3Row[col])/m/n;
             if (fabsf(pixel-imgRow[col]) > 0.1) {
@@ -159,8 +159,8 @@
     }
 
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psF32* img3Row = img3->data.F32[row];
         psF32* imgRow = img->data.F32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             psF32 pixel = img3Row[col]/m/n;
             if (fabsf(pixel-imgRow[col]) > 0.1) {
@@ -209,11 +209,11 @@
 }
 
-int testImageRealImaginary(void)
+psS32 testImageRealImaginary(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
     psImage* img3 = NULL;
-    unsigned int m = 128;
-    unsigned int n = 64;
+    psU32 m = 128;
+    psU32 n = 64;
 
     /*
@@ -250,8 +250,8 @@
 
     // 3. compare results to the real/imaginary components of input
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psF32* img2Row = img2->data.F32[row];
         psF32* img3Row = img3->data.F32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             if (fabsf(img2Row[col] - row) > FLT_EPSILON) {
                 psError(__func__,"psImageReal didn't return the real portion at n=%d",
@@ -274,11 +274,11 @@
 }
 
-int testImageComplex(void)
+psS32 testImageComplex(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
     psImage* img3 = NULL;
-    unsigned int m = 128;
-    unsigned int n = 64;
+    psU32 m = 128;
+    psU32 n = 64;
 
     /*
@@ -314,7 +314,7 @@
     // 4. call psImageReal and psImageImaginary on step 2 results (not needed, just use crealf/cimagf)
     // 5. compare step 4 results to input.
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psC32* img3Row = img3->data.C32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             if (fabsf(crealf(img3Row[col]) - row) > FLT_EPSILON ||
                     fabsf(cimagf(img3Row[col]) - col) > FLT_EPSILON) {
@@ -358,10 +358,10 @@
 }
 
-int testImageConjugate(void)
+psS32 testImageConjugate(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
-    unsigned int m = 128;
-    unsigned int n = 64;
+    psU32 m = 128;
+    psU32 n = 64;
 
     /*
@@ -385,7 +385,7 @@
 
     // 4. verify each value is conjugate of input (a+bi -> a-bi)
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psC32* img2Row = img2->data.C32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             if (fabsf(crealf(img2Row[col]) - row) > FLT_EPSILON ||
                     fabsf(cimagf(img2Row[col]) + col) > FLT_EPSILON) {
@@ -403,10 +403,10 @@
 }
 
-int testImagePowerSpectrum(void)
+psS32 testImagePowerSpectrum(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
-    unsigned int m = 128;
-    unsigned int n = 64;
+    psU32 m = 128;
+    psU32 n = 64;
 
     /*
@@ -430,8 +430,8 @@
 
     // 4. verify the values are the square of the absolute values of the original
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psC32* imgRow = img->data.C32[row];
         psF32* img2Row = img2->data.F32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             psF32 power = cabs(imgRow[col]);
             power *= power/n/n/m/m;