Index: trunk/psLib/test/image/tst_psImage.c
===================================================================
--- trunk/psLib/test/image/tst_psImage.c	(revision 1033)
+++ trunk/psLib/test/image/tst_psImage.c	(revision 1073)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-14 23:03:43 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -75,5 +75,5 @@
                 psError(__func__,"psImageAlloc returned NULL for type %x, size %dx%d.",
                         type[t], numCols[i], numRows[i]);
-                psImageFree(image);
+                psFree(image);
                 return 1;
             }
@@ -82,5 +82,5 @@
                 psError(__func__,"psImageAlloc allocated wrong dimen/type (%d/%d), should be "
                         "PS_IMAGE_DIMEN/%d", image->type.dimen, image->type.type, type[t]);
-                psImageFree(image);
+                psFree(image);
                 return 2;
             }
@@ -89,5 +89,5 @@
                 psError(__func__,"psImageAlloc allocated wrong size %dx%d, should be %dx%d (type = %d)",
                         image->numCols, image->numRows, numCols[i], numRows[i],type[t]);
-                psImageFree(image);
+                psFree(image);
                 return 3;
             }
@@ -96,5 +96,5 @@
                 psError(__func__,"psImageAlloc returned row0/col0 of %d/%d.  Should be 0/0.",
                         image->row0, image->row0);
-                psImageFree(image);
+                psFree(image);
                 return 4;
             }
@@ -102,5 +102,5 @@
             if (image->parent != NULL) {
                 psError(__func__,"psImageAlloc returned non-NULL parent");
-                psImageFree(image);
+                psFree(image);
                 return 5;
             }
@@ -108,5 +108,5 @@
             if (image->nChildren != 0) {
                 psError(__func__,"psImageAlloc returned non-zero number of children");
-                psImageFree(image);
+                psFree(image);
                 return 6;
             }
@@ -114,5 +114,5 @@
             if (image->children != NULL) {
                 psError(__func__,"psImageAlloc returned non-NULL children vector");
-                psImageFree(image);
+                psFree(image);
                 return 7;
             }
@@ -132,5 +132,5 @@
                             if (image->data.U16[r][c] != 2*c+r) {
                                 psError(__func__,"Could not set all pixels in uint16 image at (%d,%d)",c,r);
-                                psImageFree(image);
+                                psFree(image);
                                 return 8;
                             }
@@ -152,5 +152,5 @@
                             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);
-                                psImageFree(image);
+                                psFree(image);
                                 return 8;
                             }
@@ -172,5 +172,5 @@
                             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);
-                                psImageFree(image);
+                                psFree(image);
                                 return 8;
                             }
@@ -193,5 +193,5 @@
                                     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);
-                                psImageFree(image);
+                                psFree(image);
                                 return 8;
                             }
@@ -215,5 +215,5 @@
                                 psError(__func__,"Could not set all pixels in image (type=%d) at (%d,%d)",
                                         type[t],c,r);
-                                psImageFree(image);
+                                psFree(image);
                                 return 8;
                             }
@@ -225,10 +225,10 @@
             // #548: Verify no memory leaks or corruption are detected after a valid psImage structure with no
             // children is freed.
-            psImageFree(image);
+            psFree(image);
         }
     }
 
     // #548: Verify program execution doesn't stop, if the input psImage structure pointer is null.
-    psImageFree(NULL);
+    psFree(NULL);
 
     // #548: Verify no memory leaks or corruption are detected after a valid psImage structure with multiple
@@ -238,5 +238,5 @@
     psImageSubset(NULL,image,50,50,20,20);
 
-    psImageFree(image);
+    psFree(image);
 
     return 0;
@@ -501,5 +501,5 @@
     }
 
-    psImageFree(original);
+    psFree(original);
 
     return 0;
@@ -599,6 +599,6 @@
     }
 
-    psImageFree(img);
-    psImageFree(img2);
+    psFree(img);
+    psFree(img2);
 
     return 0;
@@ -678,5 +678,5 @@
         return 2; \
     } \
-    psImageFree(img);
+    psFree(img);
 
     #define testImageClipByComplexType(datatype) \
@@ -718,5 +718,5 @@
         return 2; \
     } \
-    psImageFree(img);
+    psFree(img);
 
     psLogMsg(__func__,PS_LOG_INFO,"Testing clipping of F64 imagery");
@@ -824,5 +824,5 @@
         return 2; \
     } \
-    psImageFree(img);
+    psFree(img);
 
     testImageClipNaNByType(F32);
@@ -906,6 +906,6 @@
         } \
     } \
-    psImageFree(img); \
-    psImageFree(img2);
+    psFree(img); \
+    psFree(img2);
 
     #define testOverlayType(DATATYPE) \
@@ -1016,6 +1016,6 @@
     }
 
-    psImageFree(img);
-    psImageFree(img2);
+    psFree(img);
+    psFree(img2);
 
     return 0;