Changeset 714 for trunk/psLib/test/image/tst_psImage.c

Timestamp:

May 17, 2004, 4:34:00 PM (22 years ago)

Author:

desonia

Message:

modified psImage to match currect IfA input and added copy function.

File:

• trunk/psLib/test/image/tst_psImage.c (modified) (6 diffs)

trunk/psLib/test/image/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-15 00:16:31 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-18 02:34:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -116 +116 @@
                     for (int r=0;r<rows;r++) {
                         for (int c=0;c<cols;c++) {
-                            image->data.ui16[r][c] = 2*c+r;
-                        }
-                    }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
-                            if (image->data.ui16[r][c] != 2*c+r) {
+                            image->data.U16[r][c] = 2*c+r;
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int 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);
                                 psImageFree(image);
@@ -136 +136 @@
                     for (int r=0;r<rows;r++) {
                         for (int 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++) {
-                            if (fabsf(image->data.f32[r][c] - (2.0f*c+r)) > FLT_EPSILON) {
+                            image->data.F32[r][c] = 2.0f*c+r;
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int 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);
                                 psImageFree(image);
@@ -156 +156 @@
                     for (int r=0;r<rows;r++) {
                         for (int 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++) {
-                            if (fabs(image->data.f64[r][c] - (2.0f*c+r)) > DBL_EPSILON) {
+                            image->data.F64[r][c] = 2.0f*c+r;
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int 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);
                                 psImageFree(image);
@@ -176 +176 @@
                     for (int r=0;r<rows;r++) {
                         for (int 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++) {
-                            if (fabsf(crealf(image->data.c32[r][c]) - r) > FLT_EPSILON ||
-                                    fabsf(cimagf(image->data.c32[r][c]) - c) > FLT_EPSILON ) {
+                            image->data.C32[r][c] = r + I * c;
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int 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 ) {
                                 psError(__func__,"Could not set all pixels in complex image at (%d,%d)",c,r);
                                 psImageFree(image);
@@ -198 +198 @@
                     for (int r=0;r<rows;r++) {
                         for (int c=0;c<cols;c++) {
-                            image->data.ui8[r][c] = (uint8_t)(r + c);
-                        }
-                    }
-                    for (int r=0;r<rows;r++) {
-                        for (int c=0;c<cols;c++) {
-                            if (image->data.ui8[r][c] != (uint8_t)(r + c)) {
+                            image->data.U8[r][c] = (uint8_t)(r + c);
+                        }
+                    }
+                    for (int r=0;r<rows;r++) {
+                        for (int 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)",
                                         type[t],c,r);