Changeset 15759

Timestamp:

Dec 7, 2007, 9:30:12 AM (18 years ago)

Author:

Paul Price

Message:

Adding additional details in assertions.

File:

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

trunk/psLib/src/mathtypes/psImage.h

@@ -9 +9 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-09 01:40:07 $
+ * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-12-07 19:30:12 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -37 +37 @@
     const int numCols;                 ///< Number of columns in image
     const int numRows;                 ///< Number of rows in image.
-    const int col0;                     ///< Column position relative to parent.
-    const int row0;                     ///< Row position relative to parent.
+    const int col0;                     ///< Column position relative to parent.
+    const int row0;                     ///< Row position relative to parent.
 
     union {
@@ -235 +235 @@
 if ((NAME)->type.type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-            "Unallowable operation: psImage %s has incorrect type.", \
-            #NAME); \
+            "Unallowable operation: psImage %s has incorrect type: %s instead of %s.", \
+            #NAME, PS_TYPE_NAME((NAME)->type.type), PS_TYPE_NAME(TYPE)); \
     return(RVAL); \
 }
@@ -243 +243 @@
 if ((NAME)->type.type != PS_TYPE_F32 && (NAME)->type.type != PS_TYPE_F64) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-            "Unallowable operation: psImage %s is not of type F32 or F64.", \
-            #NAME); \
+            "Unallowable operation: psImage %s is not of type F32 or F64: %s.", \
+            #NAME, PS_TYPE_NAME((NAME)->type.type)); \
     return(RVAL); \
 }
@@ -252 +252 @@
         ((NAME1)->numRows != (NAME2)->numRows)) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
-            "Unallowable operation: psImages %s and %s are not the same size.", \
-            #NAME1, #NAME2); \
+            "Unallowable operation: psImages %s and %s are not the same size: %dx%d vs %dx%d.", \
+            #NAME1, #NAME2, (NAME1)->numCols, (NAME1)->numRows, (NAME2)->numCols, (NAME2)->numRows); \
     return(RVAL); \
 }
@@ -261 +261 @@
         ((NAME1)->numRows != NUM_ROWS)) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
-            "Unallowable operation: psImages %s is not the correct size.", \
-            #NAME1); \
+            "Unallowable operation: psImages %s is not the correct size: %dx%d instead of %dx%d.", \
+            #NAME1, (NAME1)->numCols, (NAME1)->numRows, NUM_COLS, NUM_ROWS); \
     return(RVAL); \
 }