Changeset 693 for trunk/psLib/src/sysUtils

Timestamp:

May 14, 2004, 2:14:56 PM (22 years ago)

Author:

desonia

Message:

Fixed error found during testing of psImage.

File:

• trunk/psLib/src/sysUtils/psType.h (modified) (2 diffs)

trunk/psLib/src/sysUtils/psType.h

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-13 23:36:27 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-15 00:14:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
  */
 typedef enum {
-    PS_TYPE_INT8 = 0x11,              ///< Character.
-    PS_TYPE_INT16 = 0x12,             ///< Short integer.
-    PS_TYPE_INT32 = 0x14,             ///< Integer.
-    PS_TYPE_INT64 = 0x18,             ///< Long integer.
-    PS_TYPE_UINT8 = 0x31,             ///< Unsigned character.
-    PS_TYPE_UINT16 = 0x32,            ///< Unsigned short integer.
-    PS_TYPE_UINT32 = 0x34,            ///< Unsigned integer.
-    PS_TYPE_UINT64 = 0x38,            ///< Unsigned long integer.
-    PS_TYPE_FLOAT = 0x44,             ///< Single-precision Floating point.
-    PS_TYPE_DOUBLE = 0x48,            ///< Double-precision floating point.
-    PS_TYPE_COMPLEX_FLOAT = 0x84,     ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_COMPLEX_DOUBLE = 0x88,    ///< Complex numbers consisting of double-precision floating point.
+    PS_TYPE_INT8 = 0x101,              ///< Character.
+    PS_TYPE_INT16 = 0x102,             ///< Short integer.
+    PS_TYPE_INT32 = 0x104,             ///< Integer.
+    PS_TYPE_INT64 = 0x108,             ///< Long integer.
+    PS_TYPE_UINT8 = 0x301,             ///< Unsigned character.
+    PS_TYPE_UINT16 = 0x302,            ///< Unsigned short integer.
+    PS_TYPE_UINT32 = 0x304,            ///< Unsigned integer.
+    PS_TYPE_UINT64 = 0x308,            ///< Unsigned long integer.
+    PS_TYPE_FLOAT = 0x404,             ///< Single-precision Floating point.
+    PS_TYPE_DOUBLE = 0x408,            ///< Double-precision floating point.
+    PS_TYPE_COMPLEX_FLOAT = 0x808,     ///< Complex numbers consisting of single-precision floating point.
+    PS_TYPE_COMPLEX_DOUBLE = 0x810,    ///< Complex numbers consisting of double-precision floating point.
     PS_TYPE_PTR = 0x00,               ///< Something else that's not supported for arithmetic.}
 } psElemType;
 
-#define IS_PSELEMTYPE_INT(x) (x & 0x10 == 0x10)
-#define IS_PSELEMTYPE_UNSIGNED(x) (x & 0x20 == 0x20)
-#define IS_PSELEMTYPE_REAL(x) (x & 0x40 == 0x40)
-#define IS_PSELEMTYPE_COMPLEX(x) (x & 0x80 == 0x80)
-#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) : (x & 0x0F) )
+#define IS_PSELEMTYPE_INT(x) (x & 0x100 == 0x100)
+#define IS_PSELEMTYPE_UNSIGNED(x) (x & 0x200 == 0x200)
+#define IS_PSELEMTYPE_REAL(x) (x & 0x400 == 0x400)
+#define IS_PSELEMTYPE_COMPLEX(x) (x & 0x800 == 0x800)
+#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) : (x & 0xFF) )
 
 /** Dimensions of a data type.