[Teem-commit] teem/src/ten bimod.c,1.7,1.8 epireg.c,1.27,1.28 tendEval.c,1.14,1.15 tendEvec.c,1.15,1.16 tensor.c,1.28,1.29

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

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

Modified Files:
	bimod.c epireg.c tendEval.c tendEvec.c tensor.c 
Log Message:
killed off AIR_FREE and AIR_FCLOSE macros- they were just way too cute for their own good

Index: bimod.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/bimod.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bimod.c	7 Mar 2004 00:46:42 -0000	1.7
--- bimod.c	13 Mar 2004 20:03:11 -0000	1.8
***************
*** 47,53 ****
  
    if (biparm) {
!     AIR_FREE(biparm->histo);
!     AIR_FREE(biparm->pp1);
!     AIR_FREE(biparm->pp2);
    }
    return airFree(biparm);
--- 47,53 ----
  
    if (biparm) {
!     biparm->histo = airFree(biparm->histo);
!     biparm->pp1 = airFree(biparm->pp1);
!     biparm->pp2 = airFree(biparm->pp2);
    }
    return airFree(biparm);

Index: epireg.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/epireg.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** epireg.c	8 Mar 2004 14:41:24 -0000	1.27
--- epireg.c	13 Mar 2004 20:03:11 -0000	1.28
***************
*** 588,601 ****
  		     gB[1] - pxfr[SCALE]*gA[1],
  		     gB[2] - pxfr[SCALE]*gA[2],
! 		     gB[0] - pxfr[SCALE]*gA[0],
! 		     gB[1] - pxfr[SCALE]*gA[1],
! 		     gB[2] - pxfr[SCALE]*gA[2],
! 		     gB[0] - pxfr[SCALE]*gA[0],
! 		     gB[1] - pxfr[SCALE]*gA[1],
! 		     gB[2] - pxfr[SCALE]*gA[2]);
! 		     /*
! 		     gB[0]*gB[0] - pxfr[SCALE]*gA[0]*gA[0],
! 		     gB[1]*gB[1] - pxfr[SCALE]*gA[1]*gA[1],
! 		     gB[2]*gB[2] - pxfr[SCALE]*gA[2]*gA[2],
  		     gB[0]*gB[1] - pxfr[SCALE]*gA[0]*gA[1],
  		     gB[0]*gB[2] - pxfr[SCALE]*gA[0]*gA[2],
--- 588,597 ----
  		     gB[1] - pxfr[SCALE]*gA[1],
  		     gB[2] - pxfr[SCALE]*gA[2],
! 		     gB[0]*gB[0]*gB[0] - pxfr[SCALE]*gA[0]*gA[0]*gA[0],
! 		     gB[1]*gB[1]*gB[1] - pxfr[SCALE]*gA[1]*gA[1]*gA[1],
! 		     gB[2]*gB[2]*gB[2] - pxfr[SCALE]*gA[2]*gA[2]*gA[2],
! 		     gB[0]*gB[1]*gB[2] - pxfr[SCALE]*gA[0]*gA[1]*gA[2],
! 		     1, 1);
! 	  /*
  		     gB[0]*gB[1] - pxfr[SCALE]*gA[0]*gA[1],
  		     gB[0]*gB[2] - pxfr[SCALE]*gA[0]*gA[2],
***************
*** 624,630 ****
      }
    }
- 
-   /* ------ find Hx, Hy, Hz per slice */
    vec = (double *)(nvec->data);
    for (z=0; z<sz; z++) {
      if (nrrdHasNonExist(nmat[z])) {
--- 620,626 ----
      }
    }
    vec = (double *)(nvec->data);
+ 
+   /* ------ find Sx, Sy, Sz per slice */
    for (z=0; z<sz; z++) {
      if (nrrdHasNonExist(nmat[z])) {
***************
*** 638,647 ****
  	if (A == B) continue;
  	pxfr = (double *)(npxfr->data) + 0 + 5*(z + sz*(A + ninLen*B));
! 	vec[ri] = pxfr[SHEAR];
  	ri += 1;
        }
      }
      if (ell_Nm_mul(nans, ninv[z], nvec)) {
!       sprintf(err, "%s: trouble estimating model (slice %d): Hx, Hy, Hz",
  	      me, z);
        biffMove(TEN, err, ELL); airMopError(mop); return 1;
--- 634,643 ----
  	if (A == B) continue;
  	pxfr = (double *)(npxfr->data) + 0 + 5*(z + sz*(A + ninLen*B));
! 	vec[ri] = pxfr[SCALE] - 1;
  	ri += 1;
        }
      }
      if (ell_Nm_mul(nans, ninv[z], nvec)) {
!       sprintf(err, "%s: trouble estimating model (slice %d): Sx, Sy, Sz",
  	      me, z);
        biffMove(TEN, err, ELL); airMopError(mop); return 1;
***************
*** 649,659 ****
      ans = (double *)(nans->data);
      if (1 == order) {
!       ELL_3V_COPY(hst + 0*3, ans);
      } else {
!       ELL_9V_COPY(hst + 0*9, ans);
      }
    }
  
!   /* ------ find Sx, Sy, Sz per slice */
    for (z=0; z<sz; z++) {
      if (nrrdHasNonExist(nmat[z])) {
--- 645,655 ----
      ans = (double *)(nans->data);
      if (1 == order) {
!       ELL_3V_COPY(hst + 1*3, ans);
      } else {
!       ELL_9V_COPY(hst + 1*9, ans);
      }
    }
  
!   /* ------ find Hx, Hy, Hz per slice */
    for (z=0; z<sz; z++) {
      if (nrrdHasNonExist(nmat[z])) {
***************
*** 667,676 ****
  	if (A == B) continue;
  	pxfr = (double *)(npxfr->data) + 0 + 5*(z + sz*(A + ninLen*B));
! 	vec[ri] = pxfr[SCALE] - 1;
  	ri += 1;
        }
      }
      if (ell_Nm_mul(nans, ninv[z], nvec)) {
!       sprintf(err, "%s: trouble estimating model (slice %d): Sx, Sy, Sz",
  	      me, z);
        biffMove(TEN, err, ELL); airMopError(mop); return 1;
--- 663,672 ----
  	if (A == B) continue;
  	pxfr = (double *)(npxfr->data) + 0 + 5*(z + sz*(A + ninLen*B));
! 	vec[ri] = pxfr[SHEAR];
  	ri += 1;
        }
      }
      if (ell_Nm_mul(nans, ninv[z], nvec)) {
!       sprintf(err, "%s: trouble estimating model (slice %d): Hx, Hy, Hz",
  	      me, z);
        biffMove(TEN, err, ELL); airMopError(mop); return 1;
***************
*** 678,684 ****
      ans = (double *)(nans->data);
      if (1 == order) {
!       ELL_3V_COPY(hst + 1*3, ans);
      } else {
!       ELL_9V_COPY(hst + 1*9, ans);
      }
    }
--- 674,680 ----
      ans = (double *)(nans->data);
      if (1 == order) {
!       ELL_3V_COPY(hst + 0*3, ans);
      } else {
!       ELL_9V_COPY(hst + 0*9, ans);
      }
    }
***************
*** 829,833 ****
  		 int reference, int ni, int zi,
  		 Nrrd *npxfr, Nrrd *nhst, Nrrd *ngrad) {
!   double *xfr, *hst, *_grad, grad[9]; /* big enough for 2nd order */
    int sz, ninLen;
  
--- 825,829 ----
  		 int reference, int ni, int zi,
  		 Nrrd *npxfr, Nrrd *nhst, Nrrd *ngrad) {
!   double *xfr, *hst, *_g, grad[9]; /* big enough for 2nd order */
    int sz, ninLen;
  
***************
*** 843,860 ****
      /* we use the estimated H,S,T vectors to determine distortion
         as a function of gradient direction, and then invert this */
!     _grad = (double*)(ngrad->data) + 0 + 3*ni;
      if (1 == order) {
        hst = (double*)(nhst->data) + 0 + 9*zi;
!       *hhP = ELL_3V_DOT(_grad, hst + 0*3);
!       *ssP = 1 + ELL_3V_DOT(_grad, hst + 1*3);
!       *ttP = ELL_3V_DOT(_grad, hst + 2*3);
      } else {
        hst = (double*)(nhst->data) + 0 + 27*zi;
!       ELL_9V_SET(grad, _grad[0], _grad[1], _grad[2],
! 		 _grad[0], _grad[1], _grad[2],
! 		 _grad[0], _grad[1], _grad[2]);
  		 /*
! 		 _grad[0]*_grad[0], _grad[1]*_grad[1], _grad[2]*_grad[2],
! 		 _grad[0]*_grad[1], _grad[0]*_grad[2], _grad[1]*_grad[2]);
  		 */
        *hhP = ELL_9V_DOT(grad, hst + 0*9);
--- 839,856 ----
      /* we use the estimated H,S,T vectors to determine distortion
         as a function of gradient direction, and then invert this */
!     _g = (double*)(ngrad->data) + 0 + 3*ni;
      if (1 == order) {
        hst = (double*)(nhst->data) + 0 + 9*zi;
!       *hhP = ELL_3V_DOT(_g, hst + 0*3);
!       *ssP = 1 + ELL_3V_DOT(_g, hst + 1*3);
!       *ttP = ELL_3V_DOT(_g, hst + 2*3);
      } else {
        hst = (double*)(nhst->data) + 0 + 27*zi;
!       ELL_9V_SET(grad, _g[0], _g[1], _g[2],
! 		 _g[0]*_g[0]*_g[0], _g[1]*_g[1]*_g[1], _g[2]*_g[2]*_g[2],
! 		 _g[0]*_g[1]*_g[2],
! 		 0, 0);
  		 /*
! 		 _g[0]*_g[1], _g[0]*_g[2], _g[1]*_g[2]);
  		 */
        *hhP = ELL_9V_DOT(grad, hst + 0*9);

Index: tendEval.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendEval.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tendEval.c	7 Jan 2004 15:34:31 -0000	1.14
--- tendEval.c	13 Mar 2004 20:03:11 -0000	1.15
***************
*** 113,117 ****
    }
    if (1 != compLen) {
!     AIR_FREE(nout->axis[0].label);
    }
  
--- 113,117 ----
    }
    if (1 != compLen) {
!     nout->axis[0].label = airFree(nout->axis[0].label);
    }
  

Index: tendEvec.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendEvec.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tendEvec.c	7 Jan 2004 15:34:31 -0000	1.15
--- tendEvec.c	13 Mar 2004 20:03:11 -0000	1.16
***************
*** 110,114 ****
      airMopError(mop); return 1;
    }
!   AIR_FREE(nout->axis[0].label);
  
    if (nrrdSave(outS, nout, NULL)) {
--- 110,114 ----
      airMopError(mop); return 1;
    }
!   nout->axis[0].label = airFree(nout->axis[0].label);
  
    if (nrrdSave(outS, nout, NULL)) {

Index: tensor.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tensor.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tensor.c	1 Mar 2004 21:59:03 -0000	1.28
--- tensor.c	13 Mar 2004 20:03:11 -0000	1.29
***************
*** 110,114 ****
      biffMove(TEN, err, NRRD); return 1;
    }
!   AIR_FREE(nout->axis[0].label);
    nout->axis[0].label = airStrdup("matrix");
  
--- 110,114 ----
      biffMove(TEN, err, NRRD); return 1;
    }
!   nout->axis[0].label = airFree(nout->axis[0].label);
    nout->axis[0].label = airStrdup("matrix");
  
***************
*** 172,176 ****
      biffMove(TEN, err, NRRD); return 1;
    }
!   AIR_FREE(tseven->axis[0].label);
    tseven->axis[0].label = airStrdup("tensor");
  
--- 172,176 ----
      biffMove(TEN, err, NRRD); return 1;
    }
!   tseven->axis[0].label = airFree(tseven->axis[0].label);
    tseven->axis[0].label = airStrdup("tensor");
  
***************
*** 389,393 ****
      biffMove(TEN, err, NRRD); return 1;
    }
!   AIR_FREE(nout->axis[0].label);
    nout->axis[0].label = airStrdup("tensor");
  
--- 389,393 ----
      biffMove(TEN, err, NRRD); return 1;
    }
!   nout->axis[0].label = airFree(nout->axis[0].label);
    nout->axis[0].label = airStrdup("tensor");