Index: trunk/psLib/src/image/psImageExtraction.c
===================================================================
--- trunk/psLib/src/image/psImageExtraction.c	(revision 2204)
+++ trunk/psLib/src/image/psImageExtraction.c	(revision 2273)
@@ -9,6 +9,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,14 +35,12 @@
 
     if (image == NULL || image->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return NULL;
     }
 
     if (image->type.dimen != PS_DIMEN_IMAGE) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset",
-                   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;
     }
@@ -61,9 +59,8 @@
             col1 > image->numCols ||
             row1 > image->numRows ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                   col0, col1-1, row0, row1-1,
-                   image->numCols-1, image->numRows-1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                col0, col1-1, row0, row1-1,
+                image->numCols-1, image->numRows-1);
         return NULL;
     }
@@ -152,23 +149,20 @@
     // section should be of the form '[col0:col1,row0:row1]'
     if (section == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_SUBSECTION_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_SUBSECTION_NULL);
         return NULL;
     }
 
     if (sscanf(section,"[%d:%d,%d:%d]",&col0,&col1,&row0,&row1) < 4) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_SUBSECTION_INVALID,
-                   section);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_SUBSECTION_INVALID,
+                section);
         return NULL;
     }
 
     if (col0 > col1 || row0 > row1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,
-                   col0,col1,row0,row1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,
+                col0,col1,row0,row1);
         return NULL;
     }
@@ -180,7 +174,6 @@
 {
     if (image == NULL || image->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageTrim",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return NULL;
     }
@@ -209,9 +202,8 @@
             col0 >= col1 ||
             row0 >= row1 ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageTrim",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                   col0, col1-1, row0, row1-1,
-                   image->numCols-1, image->numRows-1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                col0, col1-1, row0, row1-1,
+                image->numCols-1, image->numRows-1);
         psFree(image);
         return NULL;
@@ -267,7 +259,6 @@
 
     if (in == NULL || in->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                   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;
@@ -288,9 +279,8 @@
             col0 >= col1 ||
             row0 >= row1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                   col0, col1, row0, row1,
-                   in->numCols, in->numRows);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
+                col0, col1, row0, row1,
+                in->numCols, in->numRows);
         psFree(out);
         return NULL;
@@ -307,9 +297,8 @@
     if (mask != NULL) {
         if (inRows != mask->numRows || inCols != mask->numCols) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                       PS_ERR_BAD_PARAMETER_VALUE, true,
-                       PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
-                       mask->numCols,mask->numRows,
-                       inCols, inRows);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    mask->numCols,mask->numRows,
+                    inCols, inRows);
             psFree(out);
             return NULL;
@@ -318,8 +307,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,mask->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                       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);
             return NULL;
@@ -328,7 +316,6 @@
 
     if (stats == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                   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;
@@ -338,7 +325,6 @@
     // single stats operation
     if (p_psGetStatValue(stats, &statVal) == false) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                   PS_ERR_BAD_PARAMETER_VALUE, false,
-                   PS_ERRORTEXT_psImage_BAD_STAT,stats->options);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                PS_ERRORTEXT_psImage_BAD_STAT,stats->options);
         psFree(out);
         return NULL;
@@ -423,8 +409,7 @@
                 char* typeStr;
                 PS_TYPE_NAME(typeStr,type);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                           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;
@@ -485,8 +470,7 @@
         psFree(maskVec);
     } else { // don't know what the direction flag is
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID,
-                   direction);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID,
+                direction);
         psFree(out);
         out = NULL;
@@ -512,7 +496,6 @@
 {
     if (in == NULL || in->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                   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;
@@ -522,8 +505,7 @@
 
     if (nSamples < 2) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_nSamples_TOOSMALL,
-                   nSamples);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_nSamples_TOOSMALL,
+                nSamples);
         psFree(out);
         return NULL;
@@ -534,9 +516,8 @@
             endCol < 0 || endCol >= numCols ||
             endRow < 0 || endRow >= numRows) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE,
-                   startCol,startRow,endCol,endRow,
-                   numCols-1,numRows-1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE,
+                startCol,startRow,endCol,endRow,
+                numCols-1,numRows-1);
         psFree(out);
         return NULL;
@@ -544,8 +525,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;
@@ -554,9 +534,8 @@
     if (mask != NULL) {
         if (numRows != mask->numRows || numCols != mask->numCols) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                       PS_ERR_BAD_PARAMETER_VALUE, true,
-                       PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
-                       mask->numCols,mask->numRows,
-                       numCols-1, numRows);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    mask->numCols,mask->numRows,
+                    numCols-1, numRows);
             psFree(out);
             return NULL;
@@ -565,8 +544,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,mask->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                       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);
             return NULL;
@@ -627,8 +605,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,in->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut",
-                       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;
@@ -653,7 +630,6 @@
 
     if (in == NULL || in->data.V == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   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;
@@ -664,9 +640,8 @@
     if (mask != NULL) {
         if (numRows != mask->numRows || numCols != mask->numCols) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                       PS_ERR_BAD_PARAMETER_SIZE, true,
-                       PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
-                       mask->numCols,mask->numRows,
-                       numCols, numRows);
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE,
+                    mask->numCols,mask->numRows,
+                    numCols, numRows);
             psFree(out);
             return NULL;
@@ -675,8 +650,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,mask->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                       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);
             return NULL;
@@ -686,9 +660,8 @@
     if (centerCol < 0 || centerCol >= numCols ||
             centerRow < 0 || centerRow >= numRows) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
-                   centerCol, centerRow,
-                   numCols-1, numRows-1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE,
+                centerCol, centerRow,
+                numCols-1, numRows-1);
         psFree(out);
         return NULL;
@@ -696,7 +669,6 @@
 
     if (radii == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_RADII_VECTOR_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_RADII_VECTOR_NULL);
         psFree(out);
         return NULL;
@@ -704,8 +676,7 @@
 
     if (radii->n < 2) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   PS_ERR_BAD_PARAMETER_SIZE, true,
-                   PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL,
-                   radii->n);
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL,
+                radii->n);
         psFree(out);
         return NULL;
@@ -713,7 +684,6 @@
 
     if (stats == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   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;
@@ -723,8 +693,7 @@
     // single stats operation
     if (p_psGetStatValue(stats, &statVal) == false) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut",
-                   PS_ERR_BAD_PARAMETER_VALUE, false,
-                   PS_ERRORTEXT_psImage_BAD_STAT,
-                   stats->options);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                PS_ERRORTEXT_psImage_BAD_STAT,
+                stats->options);
         psFree(out);
         return NULL;