Index: trunk/psLib/test/image/tst_psImage.c
===================================================================
--- trunk/psLib/test/image/tst_psImage.c	(revision 1929)
+++ trunk/psLib/test/image/tst_psImage.c	(revision 2204)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-29 20:17:58 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,6 +21,6 @@
 #include "psType.h"
 
-static int testImageAlloc(void);
-static int testImageCopy(void);
+static psS32 testImageAlloc(void);
+static psS32 testImageCopy(void);
 
 testDescription tests[] = {
@@ -31,5 +31,5 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -38,15 +38,15 @@
 }
 
-int testImageAlloc(void)
+psS32 testImageAlloc(void)
 {
     psImage* image = NULL;
-    unsigned int sizes = 6;
-    unsigned int numCols[] = {
-                                 0,1,1,100,100,150
-                             };
-    unsigned int numRows[] = {
-                                 0,1,100,1,150,100
-                             };
-    unsigned int types = 13;
+    psU32 sizes = 6;
+    psU32 numCols[] = {
+                          0,1,1,100,100,150
+                      };
+    psU32 numRows[] = {
+                          0,1,100,1,150,100
+                      };
+    psU32 types = 13;
     psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
                           PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
@@ -56,8 +56,8 @@
     psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
 
-    for (unsigned int t=0;t<types;t++) {
+    for (psU32 t=0;t<types;t++) {
         psLogMsg(__func__,PS_LOG_INFO,"Testing psImage with type %xh",type[t]);
 
-        for (unsigned int i=0;i<sizes;i++) {
+        for (psU32 i=0;i<sizes;i++) {
 
             if (numRows[i] == 0 || numCols[i] == 0) {
@@ -112,14 +112,14 @@
             switch (type[t]) {
             case PS_TYPE_U16: {
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i];
-
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i];
+
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.U16[r][c] = 2*c+r;
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (image->data.U16[r][c] != 2*c+r) {
                                 psError(__func__,"Could not set all pixels in uint16 image at (%d,%d)",c,r);
@@ -132,14 +132,14 @@
                 break;
             case PS_TYPE_F32: {
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i];
-
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i];
+
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.F32[r][c] = 2.0f*c+r;
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (fabsf(image->data.F32[r][c] - (2.0f*c+r)) > FLT_EPSILON) {
                                 psError(__func__,"Could not set all pixels in float image at (%d,%d)",c,r);
@@ -152,14 +152,14 @@
                 break;
             case PS_TYPE_F64: {
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i];
-
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i];
+
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.F64[r][c] = 2.0f*c+r;
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (fabs(image->data.F64[r][c] - (2.0f*c+r)) > DBL_EPSILON) {
                                 psError(__func__,"Could not set all pixels in double image at (%d,%d)",c,r);
@@ -172,14 +172,14 @@
                 break;
             case PS_TYPE_C32: {
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i];
-
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i];
+
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.C32[r][c] = r + I * c;
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (fabsf(crealf(image->data.C32[r][c]) - r) > FLT_EPSILON ||
                                     fabsf(cimagf(image->data.C32[r][c]) - c) > FLT_EPSILON ) {
@@ -193,15 +193,15 @@
                 break;
             case PS_TYPE_PTR: {
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i];
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i];
                     psImage* temp = psImageAlloc(1,1,PS_TYPE_F32);
 
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.PTR[r][c] = psMemIncrRefCounter(temp);
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (image->data.PTR[r][c] != temp) {
                                 psError(__func__, "Could not set pixel in pointer image at (%d,%d): %x %x",
@@ -218,14 +218,14 @@
             default: {
                     // ignore type and just use as byte bucket.
-                    unsigned int rows = numRows[i];
-                    unsigned int cols = numCols[i]*PSELEMTYPE_SIZEOF(type[t]);
-
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    psU32 rows = numRows[i];
+                    psU32 cols = numCols[i]*PSELEMTYPE_SIZEOF(type[t]);
+
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             image->data.U8[r][c] = (uint8_t)(r + c);
                         }
                     }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
+                    for (psS32 r=0;r<rows;r++) {
+                        for (psS32 c=0;c<cols;c++) {
                             if (image->data.U8[r][c] != (uint8_t)(r + c)) {
                                 psError(__func__,"Could not set all pixels in image (type=%d) at (%d,%d)",
@@ -253,5 +253,5 @@
 }
 
-int testImageCopy(void)
+psS32 testImageCopy(void)
 {
     psImage* img = NULL;
@@ -259,6 +259,6 @@
     psImage* img3 = NULL;
     psImage* img4 = NULL;
-    unsigned int c = 128;
-    unsigned int r = 256;
+    psU32 c = 128;
+    psU32 r = 256;
 
     img = psImageAlloc(c,r,PS_TYPE_F32);
@@ -296,5 +296,5 @@
         return 4;
     }
-    for (unsigned int row=0;row<r;row++) {
+    for (psU32 row=0;row<r;row++) {
         psF32* imgInRow = img->data.F32[row];
         psF32* imgOutRow = img4->data.F32[row];
@@ -324,8 +324,8 @@
         return 2; \
     } \
-    for (unsigned int row=0;row<r;row++) { \
+    for (psU32 row=0;row<r;row++) { \
         ps##IN* imgRow = img->data.IN[row]; \
         ps##OUT* img2Row = img2->data.OUT[row]; \
-        for (unsigned int col=0;col<c;col++) { \
+        for (psU32 col=0;col<c;col++) { \
             if (abs(imgRow[col] - (ps##IN)(row+col)) > 0.5) { \
                 psError(__func__,"Input image was changed at %d,%d!", \