Changeset 1840 for trunk/psLib/src/sysUtils

Timestamp:

Sep 21, 2004, 12:30:19 PM (22 years ago)

Author:

desonia

Message:

Changed the image code to the new psErrorMsg error handling specification.

Location:

trunk/psLib/src/sysUtils

Files:

• psMemory.c (modified) (1 diff)
• psType.h (modified) (2 diffs)

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-17 19:23:24 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-21 22:30:19 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/sysUtils/psType.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-10 01:55:34 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-21 22:30:19 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -103 +103 @@
 #define PS_MAX_C64       DBL_MAX       /**< maximum valid real or imaginary psC32 value */
 
+#define PS_TYPE_S8_NAME  "psS8"
+#define PS_TYPE_S16_NAME "psS16"
+#define PS_TYPE_S32_NAME "psS32"
+#define PS_TYPE_S64_NAME "psS64"
+#define PS_TYPE_U8_NAME  "psU8"
+#define PS_TYPE_U16_NAME "psU16"
+#define PS_TYPE_U32_NAME "psU32"
+#define PS_TYPE_U64_NAME "psU64"
+#define PS_TYPE_F32_NAME "psF32"
+#define PS_TYPE_F64_NAME "psF64"
+#define PS_TYPE_C32_NAME "psC32"
+#define PS_TYPE_C64_NAME "psC64"
+#define PS_TYPE_PTR_NAME "psPTR"
+
+#define PS_TYPE_NAME(value,type) \
+switch(type) { \
+case PS_TYPE_S8: \
+    value = PS_TYPE_S8_NAME; \
+    break; \
+case PS_TYPE_S16: \
+    value = PS_TYPE_S16_NAME; \
+    break; \
+case PS_TYPE_S32: \
+    value = PS_TYPE_S32_NAME; \
+    break; \
+case PS_TYPE_S64: \
+    value = PS_TYPE_S64_NAME; \
+    break; \
+case PS_TYPE_U8: \
+    value = PS_TYPE_U8_NAME; \
+    break; \
+case PS_TYPE_U16: \
+    value = PS_TYPE_U16_NAME; \
+    break; \
+case PS_TYPE_U32: \
+    value = PS_TYPE_U32_NAME; \
+    break; \
+case PS_TYPE_U64: \
+    value = PS_TYPE_U64_NAME; \
+    break; \
+case PS_TYPE_F32: \
+    value = PS_TYPE_F32_NAME; \
+    break; \
+case PS_TYPE_F64: \
+    value = PS_TYPE_F64_NAME; \
+    break; \
+case PS_TYPE_C32: \
+    value = PS_TYPE_C32_NAME; \
+    break; \
+case PS_TYPE_C64: \
+    value = PS_TYPE_C64_NAME; \
+    break; \
+case PS_TYPE_PTR: \
+    value = PS_TYPE_PTR_NAME; \
+    break; \
+default: \
+    value = "unknown"; \
+};
+
 /// Macro to get the bad pixel reason code (stored as part of mask value)
 #define PS_BADPIXEL_BITMASK 0x0f