[Teem-commit] teem/src/echo methodsEcho.c,1.13,1.14 objmethods.c,1.8,1.9 renderEcho.c,1.24,1.25

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/echo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26582/echo

Modified Files:
	methodsEcho.c objmethods.c renderEcho.c 
Log Message:
killed off AIR_FREE and AIR_FCLOSE macros- they were just way too cute for their own good

Index: methodsEcho.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/methodsEcho.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** methodsEcho.c	7 Jan 2004 15:34:28 -0000	1.13
--- methodsEcho.c	13 Mar 2004 20:03:09 -0000	1.14
***************
*** 54,58 ****
  echoRTParmNix(echoRTParm *parm) {
  
!   AIR_FREE(parm);
  
    return NULL;
--- 54,58 ----
  echoRTParmNix(echoRTParm *parm) {
  
!   parm = airFree(parm);
  
    return NULL;
***************
*** 74,78 ****
  echoGlobalStateNix(echoGlobalState *state) {
  
!   AIR_FREE(state);
    return NULL;
  }
--- 74,78 ----
  echoGlobalStateNix(echoGlobalState *state) {
  
!   state = airFree(state);
    return NULL;
  }
***************
*** 100,106 ****
      nrrdNuke(state->njitt);
      nrrdNuke(state->nperm);
!     AIR_FREE(state->permBuff);
!     AIR_FREE(state->chanBuff);
!     AIR_FREE(state);
    }
    return NULL;
--- 100,106 ----
      nrrdNuke(state->njitt);
      nrrdNuke(state->nperm);
!     state->permBuff = airFree(state->permBuff);
!     state->chanBuff = airFree(state->chanBuff);
!     state = airFree(state);
    }
    return NULL;
***************
*** 183,187 ****
      airArrayNuke(scene->nrrdArr);
      /* don't touch envmap nrrd */
!     AIR_FREE(scene);
    }
    return NULL;
--- 183,187 ----
      airArrayNuke(scene->nrrdArr);
      /* don't touch envmap nrrd */
!     scene = airFree(scene);
    }
    return NULL;

Index: objmethods.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/objmethods.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** objmethods.c	7 Jan 2004 15:34:28 -0000	1.8
--- objmethods.c	13 Mar 2004 20:03:09 -0000	1.9
***************
*** 98,103 ****
  	 )
  NIX_TMPL(TriMesh,
! 	 AIR_FREE(obj->pos);
! 	 AIR_FREE(obj->vert);
  	 )
  
--- 98,103 ----
  	 )
  NIX_TMPL(TriMesh,
! 	 obj->pos = airFree(obj->pos);
! 	 obj->vert = airFree(obj->vert);
  	 )
  

Index: renderEcho.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/renderEcho.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** renderEcho.c	7 Jan 2004 15:34:28 -0000	1.24
--- renderEcho.c	13 Mar 2004 20:03:09 -0000	1.25
***************
*** 50,54 ****
  		  "x,y", "jittable", "sample");
  
!   AIR_FREE(tstate->permBuff);
    if (!( tstate->permBuff = (int*)calloc(parm->numSamples, sizeof(int)) )) {
      sprintf(err, "%s: couldn't allocate permutation buffer", me);
--- 50,54 ----
  		  "x,y", "jittable", "sample");
  
!   tstate->permBuff = airFree(tstate->permBuff);
    if (!( tstate->permBuff = (int*)calloc(parm->numSamples, sizeof(int)) )) {
      sprintf(err, "%s: couldn't allocate permutation buffer", me);
***************
*** 56,60 ****
    }
  
!   AIR_FREE(tstate->chanBuff);
    if (!( tstate->chanBuff =
  	 (echoCol_t*)calloc(ECHO_IMG_CHANNELS * parm->numSamples,
--- 56,60 ----
    }
  
!   tstate->chanBuff = airFree(tstate->chanBuff);
    if (!( tstate->chanBuff =
  	 (echoCol_t*)calloc(ECHO_IMG_CHANNELS * parm->numSamples,