|
From: <kin...@us...> - 2004-03-13 20:12:02
|
Update of /cvsroot/teem/teem/src/moss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26582/moss Modified Files: methodsMoss.c sampler.c Log Message: killed off AIR_FREE and AIR_FCLOSE macros- they were just way too cute for their own good Index: methodsMoss.c =================================================================== RCS file: /cvsroot/teem/teem/src/moss/methodsMoss.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** methodsMoss.c 7 Jan 2004 15:34:30 -0000 1.8 --- methodsMoss.c 13 Mar 2004 20:03:10 -0000 1.9 *************** *** 75,83 **** if (smplr) { ! AIR_FREE(smplr->ivc); ! AIR_FREE(smplr->xFslw); ! AIR_FREE(smplr->yFslw); ! AIR_FREE(smplr->xIdx); ! AIR_FREE(smplr->yIdx); smplr->fdiam = 0; smplr->ncol = 0; --- 75,83 ---- if (smplr) { ! smplr->ivc = airFree(smplr->ivc); ! smplr->xFslw = airFree(smplr->xFslw); ! smplr->yFslw = airFree(smplr->yFslw); ! smplr->xIdx = airFree(smplr->xIdx); ! smplr->yIdx = airFree(smplr->yIdx); smplr->fdiam = 0; smplr->ncol = 0; *************** *** 91,95 **** if (smplr) { mossSamplerEmpty(smplr); ! AIR_FREE(smplr->bg); free(smplr); } --- 91,95 ---- if (smplr) { mossSamplerEmpty(smplr); ! smplr->bg = airFree(smplr->bg); free(smplr); } Index: sampler.c =================================================================== RCS file: /cvsroot/teem/teem/src/moss/sampler.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sampler.c 16 Jan 2004 17:40:14 -0000 1.10 --- sampler.c 13 Mar 2004 20:03:10 -0000 1.11 *************** *** 37,41 **** smplr->flag[mossFlagImage] = AIR_TRUE; ncol = MOSS_NCOL(image); ! AIR_FREE(smplr->bg); smplr->bg = (float*)calloc(ncol, sizeof(float)); if (bg) { --- 37,41 ---- smplr->flag[mossFlagImage] = AIR_TRUE; ncol = MOSS_NCOL(image); ! smplr->bg = airFree(smplr->bg); smplr->bg = (float*)calloc(ncol, sizeof(float)); if (bg) { |