Index: trunk/psLib/test/image/tst_psImage.c =================================================================== --- trunk/psLib/test/image/tst_psImage.c (revision 1072) +++ 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; Index: trunk/psLib/test/image/tst_psImageFFT.c =================================================================== --- trunk/psLib/test/image/tst_psImageFFT.c (revision 1072) +++ trunk/psLib/test/image/tst_psImageFFT.c (revision 1073) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-12 19:46:04 $ + * @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 @@ -116,7 +116,7 @@ } - psImageFree(img); - psImageFree(img2); - psImageFree(img3); + psFree(img); + psFree(img2); + psFree(img3); return 0; @@ -181,7 +181,7 @@ } - psImageFree(img); - psImageFree(img2); - psImageFree(img3); + psFree(img); + psFree(img2); + psFree(img3); return 0; @@ -265,7 +265,7 @@ } - psImageFree(img); - psImageFree(img2); - psImageFree(img3); + psFree(img); + psFree(img2); + psFree(img3); return 0; @@ -311,6 +311,6 @@ } - psImageFree(img); - psImageFree(img2); + psFree(img); + psFree(img2); return 0; @@ -359,7 +359,7 @@ } - psImageFree(img); - psImageFree(img2); - - return 0; -} + psFree(img); + psFree(img2); + + return 0; +} Index: trunk/psLib/test/image/tst_psImageIO.c =================================================================== --- trunk/psLib/test/image/tst_psImageIO.c (revision 1072) +++ trunk/psLib/test/image/tst_psImageIO.c (revision 1073) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-11 19:18:41 $ + * @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 @@ -107,7 +107,7 @@ return 4; \ } \ - psImageFree(img); \ + psFree(img); \ img_ref = img = psImageAlloc(2,2,PS_TYPE_F32); \ - psImageFree(img3); \ + psFree(img3); \ img3 = NULL; \ img = psImageReadSection(img,readM0,readN0,readM,readN,0,NULL,0,filename); \ @@ -139,7 +139,7 @@ } \ } \ - psImageFree(img); \ + psFree(img); \ img = NULL; \ - psImageFree(img3); \ + psFree(img3); \ img3 = NULL; \ img3 = psImageReadSection(img3,readM0,readN0,readM,readN,0,NULL,1,filename); \ @@ -167,8 +167,8 @@ } \ } \ - psImageFree(img); \ - psImageFree(img2); \ - psImageFree(img3); \ - psImageFree(img4); \ + psFree(img); \ + psFree(img2); \ + psFree(img3); \ + psFree(img4); \ } @@ -302,6 +302,6 @@ return 15; } - psImageFree(img); - psImageFree(img2); + psFree(img); + psFree(img2); // Did it really overwrite the pixel values? Let's read it in and see. @@ -322,5 +322,5 @@ } - psImageFree(img); + psFree(img); return 0; Index: trunk/psLib/test/image/tst_psImageStats00.c =================================================================== --- trunk/psLib/test/image/tst_psImageStats00.c (revision 1072) +++ trunk/psLib/test/image/tst_psImageStats00.c (revision 1073) @@ -96,5 +96,5 @@ myHist->nums->data.S32[i]); } - psHistogramFree(myHist); + psFree(myHist); psMemCheckCorruption(1); @@ -133,7 +133,7 @@ "psImageStats functions", "Deallocate the psHistogram/psImage structure."); - psHistogramFree(myHist); - psImageFree(tmpImage); - psImageFree(tmpMask); + psFree(myHist); + psFree(tmpImage); + psFree(tmpMask); psMemCheckCorruption(1); @@ -167,6 +167,6 @@ psMemCheckCorruption(1); - psHistogramFree(myHist); - psImageFree(tmpImage); + psFree(myHist); + psFree(tmpImage); psMemCheckCorruption(1); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); Index: trunk/psLib/test/image/tst_psImageStats01.c =================================================================== --- trunk/psLib/test/image/tst_psImageStats01.c (revision 1072) +++ trunk/psLib/test/image/tst_psImageStats01.c (revision 1073) @@ -123,7 +123,7 @@ "psImageStats functions", "Deallocate the psStats/psImage structure."); - psStatsFree(myStats); - psImageFree(tmpImage); - psImageFree(tmpMask); + psFree(myStats); + psFree(tmpImage); + psFree(tmpMask); psMemCheckCorruption(1); @@ -165,7 +165,7 @@ // - psStatsFree(myStats); - psImageFree(tmpImage); - psImageFree(tmpMask); + psFree(myStats); + psFree(tmpImage); + psFree(tmpMask); psMemCheckCorruption(1); Index: trunk/psLib/test/image/tst_psImageStats02.c =================================================================== --- trunk/psLib/test/image/tst_psImageStats02.c (revision 1072) +++ trunk/psLib/test/image/tst_psImageStats02.c (revision 1073) @@ -102,8 +102,8 @@ "psImageStats functions", "Deallocate the psStats/psImage structure."); - psStatsFree(myStats); - psImageFree(tmpImage); - psImageFree(outImage); - psPolynomial2DFree(my2DPoly); + psFree(myStats); + psFree(tmpImage); + psFree(outImage); + psFree(my2DPoly); psMemCheckCorruption(1); Index: trunk/psLib/test/image/verified/tst_psImageStats02.stdout =================================================================== --- trunk/psLib/test/image/verified/tst_psImageStats02.stdout (revision 1072) +++ trunk/psLib/test/image/verified/tst_psImageStats02.stdout (revision 1073) @@ -5,4 +5,22 @@ \**********************************************************************************/ +SUM(Cheby(0) * Cheby(0)) is 3.000000 +SUM(Cheby(0) * Cheby(1)) is -0.000000 +SUM(Cheby(0) * Cheby(2)) is 0.000000 +SUM(Cheby(1) * Cheby(0)) is -0.000000 +SUM(Cheby(1) * Cheby(1)) is 1.500000 +SUM(Cheby(1) * Cheby(2)) is 0.000000 +SUM(Cheby(2) * Cheby(0)) is 0.000000 +SUM(Cheby(2) * Cheby(1)) is 0.000000 +SUM(Cheby(2) * Cheby(2)) is 1.500000 +Cheby Polynomial (0, 0) coefficient is 6.000000 +Cheby Polynomial (0, 1) coefficient is 1.154701 +Cheby Polynomial (0, 2) coefficient is 0.000000 +Cheby Polynomial (1, 0) coefficient is 5.773502 +Cheby Polynomial (1, 1) coefficient is -0.000000 +Cheby Polynomial (1, 2) coefficient is -0.000000 +Cheby Polynomial (2, 0) coefficient is 0.000000 +Cheby Polynomial (2, 1) coefficient is 0.000000 +Cheby Polynomial (2, 2) coefficient is 0.000000 ---> TESTPOINT PASSED (psImageStats functions{Calculate Chebyshev Polynomials, no mask} | tst_psImageStats02.c)