Changeset 2274

Timestamp:

Nov 3, 2004, 3:59:04 PM (22 years ago)

Author:

desonia

Message:

fixed psError calls for psModule project macros.

Location:

trunk/psLib/src

Files:

• dataManip/psConstants.h (modified) (3 diffs)
• math/psConstants.h (modified) (3 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:04:57 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:59:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -326 +326 @@
 #define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \
-    psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
+    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
+            "Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
     return(RVAL); \
 }
@@ -332 +333 @@
 #define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->image->type.type != TYPE) { \
-    psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
+            "Unallowable operation: psImage %s has incorrect type.", #NAME); \
     return(RVAL); \
 }

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:04:57 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:59:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -326 +326 @@
 #define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \
-    psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
+    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
+            "Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
     return(RVAL); \
 }
@@ -332 +333 @@
 #define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->image->type.type != TYPE) { \
-    psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
+            "Unallowable operation: psImage %s has incorrect type.", #NAME); \
     return(RVAL); \
 }