Index: trunk/psLib/src/image/psImageManip.c
===================================================================
--- trunk/psLib/src/image/psImageManip.c	(revision 2204)
+++ trunk/psLib/src/image/psImageManip.c	(revision 2273)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43,8 +43,7 @@
 
     if (max < min) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_MAXMIN,
-                   (double)min,(double)max);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_MAXMIN,
+                (double)min,(double)max);
         return 0;
     }
@@ -58,16 +57,14 @@
     case PS_TYPE_##type: { \
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \
-                           PS_ERR_BAD_PARAMETER_VALUE, true, \
-                           PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
-                           "vmin",vmin, PS_TYPE_##type##_NAME, \
-                           (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        "vmin",vmin, PS_TYPE_##type##_NAME, \
+                        (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
             } \
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \
-                           PS_ERR_BAD_PARAMETER_VALUE, true, \
-                           PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
-                           "vmax",vmax, PS_TYPE_##type##_NAME, \
-                           (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        "vmax",vmax, PS_TYPE_##type##_NAME, \
+                        (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
             } \
             for (psU32 row = 0;row<numRows;row++) { \
@@ -89,16 +86,14 @@
     case PS_TYPE_##type: { \
             if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \
-                           PS_ERR_BAD_PARAMETER_VALUE, true, \
-                           PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
-                           "vmin",vmin, PS_TYPE_##type##_NAME, \
-                           (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        "vmin",vmin, PS_TYPE_##type##_NAME, \
+                        (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
             } \
             if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \
-                           PS_ERR_BAD_PARAMETER_VALUE, true, \
-                           PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
-                           "vmax",vmax, PS_TYPE_##type##_NAME, \
-                           (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                        PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \
+                        "vmax",vmax, PS_TYPE_##type##_NAME, \
+                        (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \
             } \
             for (psU32 row = 0;row<numRows;row++) { \
@@ -133,8 +128,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,input->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip",
-                       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);
         }
     }
@@ -179,8 +173,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,input->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipNaN",
-                       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);
         }
     }
@@ -204,14 +197,12 @@
 
     if (image == NULL || overlay == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return 1;
     }
 
     if (op == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImageManip_OPERATION_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImageManip_OPERATION_NULL);
         return 1;
     }
@@ -224,8 +215,7 @@
         PS_TYPE_NAME(typeStr,type);
         PS_TYPE_NAME(typeStrOverlay,overlay->type.type);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH,
-                   typeStrOverlay, typeStr);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH,
+                typeStrOverlay, typeStr);
         return 2;
     }
@@ -244,9 +234,8 @@
             imageColLimit > imageNumCols) {
 
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                   col0, imageColLimit, row0, imageRowLimit,
-                   imageNumCols, imageNumRows);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                col0, imageColLimit, row0, imageRowLimit,
+                imageNumCols, imageNumRows);
         return 3;
     }
@@ -277,8 +266,7 @@
                     break; \
                 default: \
-                    psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", \
-                               PS_ERR_BAD_PARAMETER_VALUE, true, \
-                               PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \
-                               op); \
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                            PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \
+                            op); \
                     return 5; \
                 } \
@@ -303,8 +291,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection",
-                       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);
             return 6;
         }
@@ -329,22 +316,19 @@
 
     if (input == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return 0;
     }
 
     if (realMax < realMin) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_MAXMIN_REAL,
-                   (double)realMin, (double)realMax);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_MAXMIN_REAL,
+                (double)realMin, (double)realMax);
         return 0;
     }
     if (imagMax < imagMin) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_MAXMIN_IMAG,
-                   (double)imagMin, (double)imagMax);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_MAXMIN_IMAG,
+                (double)imagMin, (double)imagMax);
         return 0;
     }
@@ -357,18 +341,16 @@
         if (realfcn(vmin) < PS_MIN_##type || imagfcn(vmin) < PS_MIN_##type || \
                 realfcn(vmin) > PS_MAX_##type || imagfcn(vmin) > PS_MAX_##type ) { \
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", \
-                       PS_ERR_BAD_PARAMETER_VALUE, true, \
-                       PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
-                       "vmin", creal(vmin), cimag(vmin), \
-                       PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    "vmin", creal(vmin), cimag(vmin), \
+                    PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
             break; \
         } \
         if (realfcn(vmax) > PS_MAX_##type || imagfcn(vmax) > PS_MAX_##type || \
                 realfcn(vmax) < PS_MIN_##type || imagfcn(vmax) < PS_MIN_##type ) { \
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", \
-                       PS_ERR_BAD_PARAMETER_VALUE, true, \
-                       PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
-                       "vmax", creal(vmax), cimag(vmax), \
-                       PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                    PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                    "vmax", creal(vmax), cimag(vmax), \
+                    PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \
             break; \
         } \
@@ -396,8 +378,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,input->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion",
-                       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);
         }
     }
@@ -424,7 +405,6 @@
 
     if (in == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(out);
         return NULL;
@@ -432,8 +412,7 @@
 
     if (scale < 1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
-                   scale);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                scale);
         psFree(out);
         return NULL;
@@ -441,7 +420,6 @@
 
     if (stats == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_STAT_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_STAT_NULL);
         psFree(out);
         return NULL;
@@ -449,8 +427,7 @@
 
     if (p_psGetStatValue(stats, &statVal) == false) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_BAD_STAT,
-                   stats->options);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_BAD_STAT,
+                stats->options);
         psFree(out);
         return NULL;
@@ -463,8 +440,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,mask->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                       PS_ERR_BAD_PARAMETER_TYPE, true,
-                       PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
-                       typeStr, PS_TYPE_MASK_NAME);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE,
+                    typeStr, PS_TYPE_MASK_NAME);
             psFree(out);
             psFree(vec);
@@ -536,8 +512,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,in->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin",
-                       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(out);
             out = NULL;
@@ -562,7 +537,6 @@
 
     if (in == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(out);
         return NULL;
@@ -570,8 +544,7 @@
 
     if (scale < 1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
-                   scale);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE,
+                scale);
         psFree(out);
         return NULL;
@@ -579,8 +552,7 @@
 
     if (mode < PS_INTERPOLATE_FLAT || mode >= PS_INTERPOLATE_NUM_MODES) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
-                   mode);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                mode);
         psFree(out);
         return NULL;
@@ -622,8 +594,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,in->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample",
-                       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(out);
             out = NULL;
@@ -644,7 +615,6 @@
 
     if (in == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRoll",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(out);
         return NULL;
@@ -694,7 +664,6 @@
 {
     if (in == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(out);
         return NULL;
@@ -741,8 +710,7 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,type);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate",
-                           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(out);
                 return NULL;
@@ -788,8 +756,7 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,type);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate",
-                           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(out);
                 return NULL;
@@ -834,8 +801,7 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,type);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate",
-                           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(out);
                 return NULL;
@@ -891,11 +857,10 @@
                     cimag(unexposedValue) < PS_MIN_##TYPE || \
                     cimag(unexposedValue) > PS_MAX_##TYPE) { \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \
-                           PS_ERR_BAD_PARAMETER_VALUE, true, \
-                           PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
-                           "unexposedValue", \
-                           creal(unexposedValue),cimag(unexposedValue), \
-                           PS_TYPE_##TYPE##_NAME,  \
-                           (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                        PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                        "unexposedValue", \
+                        creal(unexposedValue),cimag(unexposedValue), \
+                        PS_TYPE_##TYPE##_NAME,  \
+                        (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
                 psFree(out); \
                 out = NULL; \
@@ -959,8 +924,7 @@
                 char* typeStr; \
                 PS_TYPE_NAME(typeStr,type); \
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \
-                           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(out); \
                 out = NULL; \
@@ -973,8 +937,7 @@
             PSIMAGE_ROTATE_ARBITRARY_CASE(BILINEAR);
         default:
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate",
-                       PS_ERR_BAD_PARAMETER_VALUE, true,
-                       PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
-                       mode);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                    mode);
             psFree(out);
             out = NULL;
@@ -998,7 +961,6 @@
 
     if (in == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         psFree(out);
         return NULL;
@@ -1018,11 +980,10 @@
             cimag(unexposedValue) < PS_MIN_##TYPE || \
             cimag(unexposedValue) > PS_MAX_##TYPE) { \
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift", \
-                   PS_ERR_BAD_PARAMETER_VALUE, true, \
-                   PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
-                   "unexposedValue", \
-                   creal(unexposedValue),cimag(unexposedValue), \
-                   PS_TYPE_##TYPE##_NAME,  \
-                   (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+                PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \
+                "unexposedValue", \
+                creal(unexposedValue),cimag(unexposedValue), \
+                PS_TYPE_##TYPE##_NAME,  \
+                (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \
         psFree(out); \
         out = NULL; \
@@ -1058,8 +1019,7 @@
             char* typeStr; \
             PS_TYPE_NAME(typeStr,type); \
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \
-                       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(out); \
             out = NULL; \
@@ -1073,8 +1033,7 @@
         PSIMAGE_SHIFT_ARBITRARY_CASE(BILINEAR);
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
-                   mode);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED,
+                mode);
         psFree(out);
         out = NULL;
