Index: trunk/psLib/test/image/tst_psImage.c
===================================================================
--- trunk/psLib/test/image/tst_psImage.c	(revision 1406)
+++ trunk/psLib/test/image/tst_psImage.c	(revision 1606)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-06 22:34:06 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-23 22:36:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50,9 +50,5 @@
     psLogSetLevel(PS_LOG_INFO);
 
-    if (! runTestSuite(stderr,"psImage",tests,argc,argv)) {
-        psError(__FILE__,"One or more tests failed");
-        return 1;
-    }
-    return 0;
+    return ! runTestSuite(stderr,"psImage",tests,argc,argv);
 }
 
@@ -247,6 +243,6 @@
     // children isfreed.
     image = psImageAlloc(100,100,PS_TYPE_F32);
-    psImageSubset(NULL,image,50,50,0,0);
-    psImageSubset(NULL,image,50,50,20,20);
+    psImageSubset(image,50,50,0,0);
+    psImageSubset(image,50,50,20,20);
 
     psFree(image);
@@ -273,31 +269,9 @@
     }
 
-    psLogMsg(__func__,PS_LOG_INFO,"memcpy(&preSubsetStruct,original,sizeof(psImage));");
     memcpy(&preSubsetStruct,original,sizeof(psImage));
 
-    psLogMsg(__func__,PS_LOG_INFO,"subset1 = psImageAlloc(c/4,r/4,PS_TYPE_U8);");
-    subset1 = psImageAlloc(c/4,r/4,PS_TYPE_U8);
-
-    psLogMsg(__func__,PS_LOG_INFO,"subset2 = psImageSubset(subset1,original,c/2,r/2,c/4,r/4);");
-    subset2 = psImageSubset(subset1,original,c/2,r/2,c/4,r/4);
-
-    psLogMsg(__func__,PS_LOG_INFO,"subset3 = psImageSubset(NULL,original,c/2,r/2,0,0);");
-    subset3 = psImageSubset(NULL,original,c/2,r/2,0,0);
-
-    psLogMsg(__func__,PS_LOG_INFO,"Verify the returned psImage structure is equal to the input psImage "
-             "structure parameter out, if input parameter out is specified.");
-
-    if (subset1 != subset2 || subset2 == NULL) {
-        psError(__func__,"psImageSubset didn't recycle the psImage given");
-        return 1;
-    }
-
-    psLogMsg(__func__,PS_LOG_INFO,"Verify a new psImage structure is created, if input parameter out is set "
-             "to null.");
-
-    if (subset3 == NULL) {
-        psError(__func__,"psImageSubset output was NULL for subset3.");
-        return 2;
-    }
+    subset2 = psImageSubset(original,c/2,r/2,c/4,r/4);
+
+    subset3 = psImageSubset(original,c/2,r/2,0,0);
 
     psLogMsg(__func__,PS_LOG_INFO,"Verify the returned psImage structure contains expected values in the "
@@ -397,5 +371,5 @@
 
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,NULL,c/2,r/2,0,0);
+    subset1 = psImageSubset(NULL,c/2,r/2,0,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when input image was NULL.");
@@ -409,5 +383,5 @@
     memcpy(&preSubsetStruct,original,sizeof(psImage));
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,0,0,0);
+    subset1 = psImageSubset(original,c/2,0,0,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when numRows=0.");
@@ -415,5 +389,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,0,r/2,0,0);
+    subset1 = psImageSubset(original,0,r/2,0,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when numCols=0.");
@@ -431,5 +405,5 @@
 
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,c,0);
+    subset1 = psImageSubset(original,c/2,r/2,c,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset origin was outside of "
@@ -438,5 +412,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,0,r);
+    subset1 = psImageSubset(original,c/2,r/2,0,r);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset origin was outside of "
@@ -445,5 +419,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,-1,0);
+    subset1 = psImageSubset(original,c/2,r/2,-1,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset origin was outside of "
@@ -452,5 +426,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,0,-1);
+    subset1 = psImageSubset(original,c/2,r/2,0,-1);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset origin was outside of "
@@ -465,5 +439,5 @@
 
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,c/2,0);
+    subset1 = psImageSubset(original,c/2,r/2,c/2,0);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset was outside of image (via rows).");
@@ -471,5 +445,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,0,r/2);
+    subset1 = psImageSubset(original,c/2,r/2,0,r/2);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset was outside of image (via cols).");
@@ -477,5 +451,5 @@
     }
     psLogMsg(__func__,PS_LOG_INFO,"An error should follow...");
-    subset1 = psImageSubset(NULL,original,c/2,r/2,c/2,r/2);
+    subset1 = psImageSubset(original,c/2,r/2,c/2,r/2);
     if (subset1 != NULL) {
         psError(__func__,"psImageSubset didn't return NULL when subset was outside of image (via row+cols).");