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

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

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.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-25 23:59:17 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 23:29:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
     unsigned int numRows[] = {0,1,100,1,150,100};
     unsigned int types = 12;
-    psElemType type[] = { PS_TYPE_INT8, PS_TYPE_INT16, PS_TYPE_INT32, PS_TYPE_INT64,
-                          PS_TYPE_UINT8, PS_TYPE_UINT16, PS_TYPE_UINT32, PS_TYPE_UINT64,
-                          PS_TYPE_FLOAT, PS_TYPE_DOUBLE, PS_TYPE_COMPLEX_FLOAT, PS_TYPE_COMPLEX_DOUBLE };
+    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,
+                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64 };
 
     psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
@@ -111 +111 @@
 
             switch (type[t]) {
-            case PS_TYPE_UINT16: {
+            case PS_TYPE_U16: {
                     unsigned int rows = numRows[i];
                     unsigned int cols = numCols[i];
@@ -131 +131 @@
                 }
                 break;
-            case PS_TYPE_FLOAT: {
+            case PS_TYPE_F32: {
                     unsigned int rows = numRows[i];
                     unsigned int cols = numCols[i];
@@ -151 +151 @@
                 }
                 break;
-            case PS_TYPE_DOUBLE: {
+            case PS_TYPE_F64: {
                     unsigned int rows = numRows[i];
                     unsigned int cols = numCols[i];
@@ -171 +171 @@
                 }
                 break;
-            case PS_TYPE_COMPLEX_FLOAT: {
+            case PS_TYPE_C32: {
                     unsigned int rows = numRows[i];
                     unsigned int cols = numCols[i];