Index: trunk/psLib/src/image/psImage.c
===================================================================
--- trunk/psLib/src/image/psImage.c	(revision 2204)
+++ trunk/psLib/src/image/psImage.c	(revision 2273)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,8 +40,7 @@
 
     if (area < 1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageAlloc",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_AREA_NEGATIVE,
-                   numRows, numCols);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_AREA_NEGATIVE,
+                numRows, numCols);
         return NULL;
     }
@@ -119,7 +118,6 @@
     if (old->type.dimen != PS_DIMEN_IMAGE) {
         psFree(old);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRecycle",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
         return NULL;
     }
@@ -175,7 +173,6 @@
 
     if (input == NULL || input->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(output);
         return NULL;
@@ -183,7 +180,6 @@
 
     if (input == output) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED);
         psFree(output);
         return NULL;
@@ -191,7 +187,6 @@
 
     if (input->type.dimen != PS_DIMEN_IMAGE) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
         psFree(output);
         return NULL;
@@ -205,8 +200,7 @@
 
     if (inDatatype == PS_TYPE_PTR || type == PS_TYPE_PTR) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
-                   PS_TYPE_PTR_NAME);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                PS_TYPE_PTR_NAME);
         psFree(output);
         return NULL;
@@ -319,8 +313,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy",
-                       PS_ERR_BAD_PARAMETER_TYPE, true,
-                       PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
-                       typeStr);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    typeStr);
             psFree(output);
 
@@ -372,7 +365,6 @@
 
     if (input == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate",
-                   PS_ERR_BAD_PARAMETER_NULL,true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL,true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return unexposedValue;
     }
@@ -400,8 +392,7 @@
         break;                                                       \
     default:                                                         \
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate",    \
-                   PS_ERR_BAD_PARAMETER_VALUE,true,                  \
-                   PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID,  \
-                   mode);                                            \
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,                     \
+                PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID,     \
+                mode);                                               \
     }                                                                \
     break
@@ -423,8 +414,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,input->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate",
-                       PS_ERR_BAD_PARAMETER_TYPE,true,
-                       PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
-                       typeStr);
+            psError(PS_ERR_BAD_PARAMETER_TYPE,true,
+                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    typeStr);
         }
     }