Index: trunk/psLib/test/image/tst_psImage.c
===================================================================
--- trunk/psLib/test/image/tst_psImage.c	(revision 2204)
+++ trunk/psLib/test/image/tst_psImage.c	(revision 2273)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71,5 +71,5 @@
                     continue;
                 }
-                psError(__func__,"psImageAlloc returned NULL for type %x, size %dx%d.",
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc returned NULL for type %x, size %dx%d.",
                         type[t], numCols[i], numRows[i]);
                 psFree(image);
@@ -78,5 +78,5 @@
 
             if (image->type.dimen != PS_DIMEN_IMAGE || image->type.type != type[t]) {
-                psError(__func__,"psImageAlloc allocated wrong dimen/type (%d/%d), should be "
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc allocated wrong dimen/type (%d/%d), should be "
                         "PS_IMAGE_DIMEN/%d", image->type.dimen, image->type.type, type[t]);
                 psFree(image);
@@ -85,5 +85,5 @@
 
             if (image->numCols != numCols[i] || image->numRows != numRows[i]) {
-                psError(__func__,"psImageAlloc allocated wrong size %dx%d, should be %dx%d (type = %d)",
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc allocated wrong size %dx%d, should be %dx%d (type = %d)",
                         image->numCols, image->numRows, numCols[i], numRows[i],type[t]);
                 psFree(image);
@@ -92,5 +92,5 @@
 
             if (image->col0 != 0 || image->row0 != 0) {
-                psError(__func__,"psImageAlloc returned row0/col0 of %d/%d.  Should be 0/0.",
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc returned row0/col0 of %d/%d.  Should be 0/0.",
                         image->row0, image->row0);
                 psFree(image);
@@ -99,5 +99,5 @@
 
             if (image->parent != NULL) {
-                psError(__func__,"psImageAlloc returned non-NULL parent");
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc returned non-NULL parent");
                 psFree(image);
                 return 5;
@@ -105,5 +105,5 @@
 
             if (image->children != NULL) {
-                psError(__func__,"psImageAlloc returned non-NULL children array");
+                psError(PS_ERR_UNKNOWN, true,"psImageAlloc returned non-NULL children array");
                 psFree(image);
                 return 7;
@@ -123,5 +123,5 @@
                         for (psS32 c=0;c<cols;c++) {
                             if (image->data.U16[r][c] != 2*c+r) {
-                                psError(__func__,"Could not set all pixels in uint16 image at (%d,%d)",c,r);
+                                psError(PS_ERR_UNKNOWN, true,"Could not set all pixels in uint16 image at (%d,%d)",c,r);
                                 psFree(image);
                                 return 8;
@@ -143,5 +143,5 @@
                         for (psS32 c=0;c<cols;c++) {
                             if (fabsf(image->data.F32[r][c] - (2.0f*c+r)) > FLT_EPSILON) {
-                                psError(__func__,"Could not set all pixels in float image at (%d,%d)",c,r);
+                                psError(PS_ERR_UNKNOWN, true,"Could not set all pixels in float image at (%d,%d)",c,r);
                                 psFree(image);
                                 return 8;
@@ -163,5 +163,5 @@
                         for (psS32 c=0;c<cols;c++) {
                             if (fabs(image->data.F64[r][c] - (2.0f*c+r)) > DBL_EPSILON) {
-                                psError(__func__,"Could not set all pixels in double image at (%d,%d)",c,r);
+                                psError(PS_ERR_UNKNOWN, true,"Could not set all pixels in double image at (%d,%d)",c,r);
                                 psFree(image);
                                 return 8;
@@ -184,5 +184,5 @@
                             if (fabsf(crealf(image->data.C32[r][c]) - r) > FLT_EPSILON ||
                                     fabsf(cimagf(image->data.C32[r][c]) - c) > FLT_EPSILON ) {
-                                psError(__func__,"Could not set all pixels in complex image at (%d,%d)",c,r);
+                                psError(PS_ERR_UNKNOWN, true,"Could not set all pixels in complex image at (%d,%d)",c,r);
                                 psFree(image);
                                 return 8;
@@ -205,5 +205,5 @@
                         for (psS32 c=0;c<cols;c++) {
                             if (image->data.PTR[r][c] != temp) {
-                                psError(__func__, "Could not set pixel in pointer image at (%d,%d): %x %x",
+                                psError(PS_ERR_UNKNOWN, true, "Could not set pixel in pointer image at (%d,%d): %x %x",
                                         c,r,image->data.PTR[r][c],temp);
                                 psFree(image);
@@ -229,5 +229,5 @@
                         for (psS32 c=0;c<cols;c++) {
                             if (image->data.U8[r][c] != (uint8_t)(r + c)) {
-                                psError(__func__,"Could not set all pixels in image (type=%d) at (%d,%d)",
+                                psError(PS_ERR_UNKNOWN, true,"Could not set all pixels in image (type=%d) at (%d,%d)",
                                         type[t],c,r);
                                 psFree(image);
@@ -281,5 +281,5 @@
     // Verify the returned psImage structure pointer is equal to the input parameter output.
     if (img2 != img3) {
-        psError(__func__,"the image given for recycled wasn't");
+        psError(PS_ERR_UNKNOWN, true,"the image given for recycled wasn't");
         return 1;
     }
@@ -289,9 +289,9 @@
     img4 = psImageCopy(NULL,img,PS_TYPE_F32);
     if (img4 == NULL) {
-        psError(__func__,"output image doesn't exist");
+        psError(PS_ERR_UNKNOWN, true,"output image doesn't exist");
         return 4;
     }
     if (img4->type.type != img->type.type) {
-        psError(__func__,"output image is not the same type as input image");
+        psError(PS_ERR_UNKNOWN, true,"output image is not the same type as input image");
         return 4;
     }
@@ -301,5 +301,5 @@
         for (unsigned col=0;col<c;col++) {
             if( imgInRow[col] != imgOutRow[col] ) {
-                psError(__func__,"Input image not equal to output image at %d,%d!",
+                psError(PS_ERR_UNKNOWN, true,"Input image not equal to output image at %d,%d!",
                         col, row);
                 return 4;
@@ -321,5 +321,5 @@
     img2 = psImageCopy(img2,img,PS_TYPE_##OUT); \
     if (img2 == NULL) { \
-        psError(__func__,"psImageCopy failed to copy U8."); \
+        psError(PS_ERR_UNKNOWN, true,"psImageCopy failed to copy U8."); \
         return 2; \
     } \
@@ -329,10 +329,10 @@
         for (psU32 col=0;col<c;col++) { \
             if (abs(imgRow[col] - (ps##IN)(row+col)) > 0.5) { \
-                psError(__func__,"Input image was changed at %d,%d!", \
+                psError(PS_ERR_UNKNOWN, true,"Input image was changed at %d,%d!", \
                         col,row); \
                 return 2; \
             } \
             if (abs(img2Row[col] - (ps##OUT)(imgRow[col])) > 0.5) { \
-                psError(__func__,"returned psImage values after copy don't match at %d,%d " \
+                psError(PS_ERR_UNKNOWN, true,"returned psImage values after copy don't match at %d,%d " \
                         "(%d vs %d)",\
                         col,row,img2Row[col], (ps##OUT)(imgRow[col])); \
@@ -382,5 +382,5 @@
     img3 = psImageCopy(NULL,NULL,PS_TYPE_F32);
     if (img3 != NULL) {
-        psError(__func__,"psImageCopy didn't return NULL when input image was NULL.");
+        psError(PS_ERR_UNKNOWN, true,"psImageCopy didn't return NULL when input image was NULL.");
         return 3;
     }