Index: trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.c	(revision 2204)
+++ trunk/psLib/src/imageops/psImageConvolve.c	(revision 2273)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -110,7 +110,6 @@
     // got non-NULL vectors?
     if (tShifts == NULL || xShifts == NULL || yShifts == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImageConvolve_SHIFT_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImageConvolve_SHIFT_NULL);
         return NULL;
     }
@@ -125,8 +124,7 @@
         PS_TYPE_NAME(typeYStr,yShifts->type.type);
         PS_TYPE_NAME(typeTStr,tShifts->type.type);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH,
-                   typeTStr, typeXStr, typeYStr);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH,
+                typeTStr, typeXStr, typeYStr);
         return NULL;
     }
@@ -218,8 +216,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,xShifts->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
-                       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);
         }
     }
@@ -236,7 +233,6 @@
 
     if (kernel == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImageConvolve_KERNEL_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImageConvolve_KERNEL_NULL);
         psFree(out);
         return NULL;
@@ -297,8 +293,7 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,in->type.type);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                           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;
@@ -317,9 +312,8 @@
         psS32 kCols = kernel->image->numCols;
         if (kRows >= numRows || kCols >= numCols) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                       PS_ERR_BAD_PARAMETER_SIZE, true,
-                       PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE,
-                       kCols,kRows,
-                       numCols, numRows);
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                    PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE,
+                    kCols,kRows,
+                    numCols, numRows);
             psFree(out);
             return NULL;
@@ -376,7 +370,6 @@
         psImage* kernelFourier = psImageFFT(NULL, paddedKernel, PS_FFT_FORWARD);
         if (kernelFourier == NULL) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                       PS_ERR_UNKNOWN, false,
-                       PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED);
+            psError(PS_ERR_UNKNOWN, false,
+                    PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED);
             psFree(out);
             return NULL;
@@ -385,7 +378,6 @@
         psImage* inFourier = psImageFFT(NULL, paddedImage, PS_FFT_FORWARD);
         if (inFourier == NULL) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                       PS_ERR_UNKNOWN, false,
-                       PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
+            psError(PS_ERR_UNKNOWN, false,
+                    PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
             psFree(out);
             return NULL;
@@ -398,7 +390,6 @@
                                          PS_FFT_REVERSE);
         if (complexOut == NULL) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve",
-                       PS_ERR_UNKNOWN, false,
-                       PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
+            psError(PS_ERR_UNKNOWN, false,
+                    PS_ERRORTEXT_psImageConvolve_FFT_FAILED);
             psFree(out);
             return NULL;