Index: trunk/psLib/test/dataManip/tst_psFunc00.c =================================================================== --- trunk/psLib/test/dataManip/tst_psFunc00.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psFunc00.c (revision 1073) @@ -53,5 +53,5 @@ psEvalPolynomial1D(MISC_X_VALUE, my1DPoly)); - psPolynomial1DFree(my1DPoly); + psFree(my1DPoly); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -83,5 +83,5 @@ psEvalPolynomial2D(MISC_X_VALUE, MISC_X_VALUE, my2DPoly)); - psPolynomial2DFree(my2DPoly); + psFree(my2DPoly); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -114,5 +114,5 @@ psEvalPolynomial3D(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPoly)); - psPolynomial3DFree(my3DPoly); + psFree(my3DPoly); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -148,5 +148,5 @@ psEvalPolynomial4D(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPoly)); - psPolynomial4DFree(my4DPoly); + psFree(my4DPoly); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -178,5 +178,5 @@ psDEvalPolynomial1D(MISC_X_VALUE, my1DPolyD)); - psDPolynomial1DFree(my1DPolyD); + psFree(my1DPolyD); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -187,8 +187,4 @@ "Allocate/Deallocate the psDPolynomial1D structure.", testStatus); - - - - printPositiveTestHeader(stdout, @@ -208,5 +204,5 @@ psDEvalPolynomial2D(MISC_X_VALUE, MISC_X_VALUE, my2DPolyD)); - psDPolynomial2DFree(my2DPolyD); + psFree(my2DPolyD); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -239,5 +235,5 @@ psDEvalPolynomial3D(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPolyD)); - psDPolynomial3DFree(my3DPolyD); + psFree(my3DPolyD); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { @@ -273,5 +269,5 @@ psDEvalPolynomial4D(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPolyD)); - psDPolynomial4DFree(my4DPolyD); + psFree(my4DPolyD); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); if (0 != memLeaks) { Index: trunk/psLib/test/dataManip/tst_psFunc01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psFunc01.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psFunc01.c (revision 1073) @@ -56,5 +56,5 @@ } - psVectorFree(myGaussData); + psFree(myGaussData); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist00.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psHist00.c (revision 1073) @@ -79,5 +79,5 @@ psMemCheckCorruption(1); - psHistogramFree(myHist); + psFree(myHist); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psHist01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist01.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psHist01.c (revision 1073) @@ -84,7 +84,7 @@ } psMemCheckCorruption(1); - psHistogramFree(myHist); + psFree(myHist); psMemCheckCorruption(1); - psVectorFree(myBounds); + psFree(myBounds); printFooter(stdout, Index: trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist02.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psHist02.c (revision 1073) @@ -75,5 +75,5 @@ } psMemCheckCorruption(1); - psHistogramFree(myHist); + psFree(myHist); psMemCheckCorruption(1); @@ -100,5 +100,5 @@ } psMemCheckCorruption(1); - psHistogramFree(myHist); + psFree(myHist); psMemCheckCorruption(1); @@ -108,5 +108,5 @@ testStatus); } - psVectorFree(myMask); + psFree(myMask); printPositiveTestHeader(stdout, @@ -122,5 +122,5 @@ testStatus = false; } - psVectorFree(myData); + psFree(myData); @@ -135,5 +135,5 @@ testStatus = false; } - psHistogramFree(myHist); + psFree(myHist); @@ -152,6 +152,6 @@ testStatus = false; } - psHistogramFree(myHist); - psVectorFree(myData); + psFree(myHist); + psFree(myData); */ printFooter(stdout, Index: trunk/psLib/test/dataManip/tst_psMatrix01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 1073) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-07 20:47:52 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -75,7 +75,7 @@ // Test D - Free images and check for leaks printPositiveTestHeader(stdout, "psMatrix", "Free images and check for leaks"); - psImageFree(inImage); - psImageFree(outImage); - psImageFree(outImageNull); + psFree(inImage); + psFree(outImage); + psFree(outImageNull); psMemCheckLeaks(0, NULL, stdout); int nBad = psMemCheckCorruption(0); Index: trunk/psLib/test/dataManip/tst_psMatrix03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 1073) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-07 20:25:03 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,9 +104,9 @@ // Test D - Free input and output images and vectors printPositiveTestHeader(stdout, "psMatrix", "Free input and output images and vectors"); - psImageFree(inImage); - psImageFree(luImage); - psVectorFree(perm); - psVectorFree(outVector); - psVectorFree(inVector); + psFree(inImage); + psFree(luImage); + psFree(perm); + psFree(outVector); + psFree(inVector); psMemCheckLeaks(0, NULL, stdout); int nBad = psMemCheckCorruption(0); Index: trunk/psLib/test/dataManip/tst_psMatrix04.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 1073) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-07 20:25:03 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -82,6 +82,6 @@ // Test D - Free input and output images printPositiveTestHeader(stdout, "psMatrix", "Free input and output images"); - psImageFree(outImage); - psImageFree(inImage); + psFree(outImage); + psFree(inImage); psFree(det2); psMemCheckLeaks(0, NULL, stdout); Index: trunk/psLib/test/dataManip/tst_psMatrix05.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 1073) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-28 02:52:23 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -65,7 +65,7 @@ // Test C - Free input and output images printPositiveTestHeader(stdout, "psMatrix", "Free input and output images"); - psImageFree(outImage); - psImageFree(inImage1); - psImageFree(inImage2); + psFree(outImage); + psFree(inImage1); + psFree(inImage2); psMemCheckLeaks(0, NULL, stdout); int nBad = psMemCheckCorruption(0); Index: trunk/psLib/test/dataManip/tst_psMatrix06.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 1073) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-28 02:52:23 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -74,6 +74,6 @@ // Test C - Free input and output images printPositiveTestHeader(stdout, "psMatrix", "Free input and output images"); - psImageFree(outImage); - psImageFree(inImage); + psFree(outImage); + psFree(inImage); psMemCheckLeaks(0, NULL, stdout); int nBad = psMemCheckCorruption(0); Index: trunk/psLib/test/dataManip/tst_psMatrix07.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 1073) @@ -16,6 +16,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-08 01:56:35 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -157,11 +157,11 @@ // Test I - Free input and output images printPositiveTestHeader(stdout, "psMatrix", "Free input and output images and vectors"); - psImageFree(m1); - psVectorFree(v1); - psImageFree(m2); - psVectorFree(v2); - psImageFree(m3); - psImageFree(m4); - psImageFree(badImage); + psFree(m1); + psFree(v1); + psFree(m2); + psFree(v2); + psFree(m3); + psFree(m4); + psFree(badImage); psMemCheckLeaks(0, NULL, stdout); int nBad = psMemCheckCorruption(0); Index: trunk/psLib/test/dataManip/tst_psStats00.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats00.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats00.c (revision 1073) @@ -186,7 +186,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats01.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats01.c (revision 1073) @@ -107,7 +107,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats02.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats02.c (revision 1073) @@ -107,7 +107,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats03.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats03.c (revision 1073) @@ -102,7 +102,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats05.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats05.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats05.c (revision 1073) @@ -59,5 +59,5 @@ "psStats functions", "Deallocate the psStats structure."); - psStatsFree(myStats); + psFree(myStats); psMemCheckCorruption(1); @@ -73,16 +73,4 @@ testStatus); - - - printPositiveTestHeader(stdout, - "psStats functions", - "Deallocate NULL psStats structure."); - psStatsFree(NULL); - printFooter(stdout, - "psStats functions", - "Deallocate NULL psStats structure.", - testStatus); - - return (!testStatus); } Index: trunk/psLib/test/dataManip/tst_psStats06.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats06.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats06.c (revision 1073) @@ -110,7 +110,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats07.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats07.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats07.c (revision 1073) @@ -395,7 +395,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats08.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats08.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats08.c (revision 1073) @@ -154,7 +154,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myVector); - psVectorFree(maskVector); + psFree(myStats); + psFree(myVector); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psStats09.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats09.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psStats09.c (revision 1073) @@ -128,7 +128,7 @@ "psStats(): deallocating memory"); - psStatsFree(myStats); - psVectorFree(myGaussData); - psVectorFree(maskVector); + psFree(myStats); + psFree(myGaussData); + psFree(maskVector); psMemCheckCorruption(1); Index: trunk/psLib/test/dataManip/tst_psVectorFFT.c =================================================================== --- trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 1072) +++ trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 1073) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-12 01:34:10 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-23 23:00:17 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -112,7 +112,7 @@ } - psVectorFree(vec); - psVectorFree(vec2); - psVectorFree(vec3); + psFree(vec); + psFree(vec2); + psFree(vec3); return 0; @@ -177,7 +177,7 @@ } - psVectorFree(vec); - psVectorFree(vec2); - psVectorFree(vec3); + psFree(vec); + psFree(vec2); + psFree(vec3); return 0; @@ -262,7 +262,7 @@ } - psVectorFree(vec); - psVectorFree(vec2); - psVectorFree(vec3); + psFree(vec); + psFree(vec2); + psFree(vec3); return 0; @@ -307,6 +307,6 @@ } - psVectorFree(vec); - psVectorFree(vec2); + psFree(vec); + psFree(vec2); return 0; @@ -374,7 +374,7 @@ }; - psVectorFree(vec); - psVectorFree(vec2); - - return 0; -} + psFree(vec); + psFree(vec2); + + return 0; +} Index: trunk/psLib/test/dataManip/verified/tst_psStats05.stdout =================================================================== --- trunk/psLib/test/dataManip/verified/tst_psStats05.stdout (revision 1072) +++ trunk/psLib/test/dataManip/verified/tst_psStats05.stdout (revision 1073) @@ -17,11 +17,2 @@ ---> TESTPOINT PASSED (psStats functions{Deallocate the psStats structure.} | tst_psStats05.c) -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_psStats05.c * -* TestPoint: psStats functions{Deallocate NULL psStats structure.} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (psStats functions{Deallocate NULL psStats structure.} | tst_psStats05.c) -