Changeset 2204 for trunk/psLib/test/image/tst_psImageIO.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/image/tst_psImageIO.c (modified) (8 diffs)

trunk/psLib/test/image/tst_psImageIO.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-02 02:09:21 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #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 testImageRead(void);
-static int testImageWrite(void);
+static psS32 testImageRead(void);
+static psS32 testImageWrite(void);
 
 testDescription tests[] = {
@@ -47 +47 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -57 +57 @@
 }
 
-int testImageRead(void)
+psS32 testImageRead(void)
 {
-    int N = 256;
-    int M = 128;
+    psS32 N = 256;
+    psS32 M = 128;
     psImage* image = NULL;
 
@@ -127 +127 @@
             return 6; \
         } \
-        for (unsigned int row = readN0; row < readN; row++) { \
+        for (psU32 row = readN0; row < readN; row++) { \
             ps##TYP* imgRow = img->data.TYP[row-readN0]; \
             ps##TYP* img2Row = img2->data.TYP[row]; \
             ps##TYP* img3Row = img3->data.TYP[row-readN0]; \
             ps##TYP* img4Row = img4->data.TYP[row]; \
-            for (unsigned int col = readM0; col < readM; col++) { \
+            for (psU32 col = readM0; col < readM; col++) { \
                 if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \
                     psError(__func__,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \
@@ -155 +155 @@
             return 9; \
         } \
-        for (unsigned int row = readN0; row < readN; row++) { \
+        for (psU32 row = readN0; row < readN; row++) { \
             ps##TYP* imgRow = img->data.TYP[row-readN0]; \
             ps##TYP* img2Row = img2->data.TYP[row]; \
             ps##TYP* img3Row = img3->data.TYP[row-readN0]; \
             ps##TYP* img4Row = img4->data.TYP[row]; \
-            for (unsigned int col = readM0; col < readM; col++) { \
+            for (psU32 col = readM0; col < readM; col++) { \
                 if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \
                     psError(__func__,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \
@@ -258 +258 @@
 }
 
-int testImageWrite(void)
+psS32 testImageWrite(void)
 {
     psImage* img = NULL;
     psImage* img2 = NULL;
-    int m = 64;
-    int n = 96;
+    psS32 m = 64;
+    psS32 n = 96;
 
     /*
@@ -318 +318 @@
         return 16;
     }
-    for (unsigned int row=0;row<n;row++) {
+    for (psU32 row=0;row<n;row++) {
         psF32* imgRow = img->data.F32[row];
-        for (unsigned int col=0;col<m;col++) {
+        for (psU32 col=0;col<m;col++) {
             if (fabsf(imgRow[col] - (row+2*col)) > FLT_EPSILON) {
                 psError(__func__,"The image values were not overwritten at %d,%d (%.2f vs %.2f)",