Changeset 15760

Timestamp:

Dec 7, 2007, 9:33:19 AM (18 years ago)

Author:

Paul Price

Message:

Fixing use of macro.

File:

• trunk/psLib/src/mathtypes/psImage.h (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.h

@@ -9 +9 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-12-07 19:30:12 $
+ * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-12-07 19:33:19 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -234 +234 @@
 #define PS_ASSERT_IMAGE_TYPE(NAME, TYPE, RVAL) \
 if ((NAME)->type.type != TYPE) { \
+    char *imageType, *desiredType; \
+    PS_TYPE_NAME(imageType, (NAME)->type.type); \
+    PS_TYPE_NAME(desiredType, TYPE); \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "Unallowable operation: psImage %s has incorrect type: %s instead of %s.", \
-            #NAME, PS_TYPE_NAME((NAME)->type.type), PS_TYPE_NAME(TYPE)); \
+            #NAME, imageType, desiredType); \
     return(RVAL); \
 }
@@ -242 +245 @@
 #define PS_ASSERT_IMAGE_TYPE_F32_OR_F64(NAME, RVAL) \
 if ((NAME)->type.type != PS_TYPE_F32 && (NAME)->type.type != PS_TYPE_F64) { \
+    char *imageType; \
+    PS_TYPE_NAME(imageType, (NAME)->type.type); \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "Unallowable operation: psImage %s is not of type F32 or F64: %s.", \
-            #NAME, PS_TYPE_NAME((NAME)->type.type)); \
+            #NAME, imageType); \
     return(RVAL); \
 }