[Teem-commit] teem/src/ten epireg.c,1.23,1.24 fiberMethods.c,1.12,1.13 ten.h,1.69,1.70 tenGage.c,1.9,1.10

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

Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1:/tmp/cvs-serv23315/ten

Modified Files:
	epireg.c fiberMethods.c ten.h tenGage.c 
Log Message:
NrrdKernels now const-correct

Index: epireg.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/epireg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** epireg.c	7 Jan 2004 15:34:31 -0000	1.23
--- epireg.c	16 Jan 2004 17:35:12 -0000	1.24
***************
*** 52,56 ****
  		int reference,
  		float bwX, float bwY, float DWthr,
! 		NrrdKernel *kern, double *kparm) {
    char me[]="_tenEpiRegCheck", err[AIR_STRLEN_MED];
    int ni;
--- 52,56 ----
  		int reference,
  		float bwX, float bwY, float DWthr,
! 		const NrrdKernel *kern, double *kparm) {
    char me[]="_tenEpiRegCheck", err[AIR_STRLEN_MED];
    int ni;
***************
*** 760,764 ****
  int
  _tenEpiRegSliceWarp(Nrrd *nout, Nrrd *nin, Nrrd *nwght, Nrrd *nidx, 
! 		    NrrdKernel *kern, double *kparm,
  		    double hh, double ss, double tt, double cx, double cy) {
    float *wght, *in, pp, pf, tmp;
--- 760,764 ----
  int
  _tenEpiRegSliceWarp(Nrrd *nout, Nrrd *nin, Nrrd *nwght, Nrrd *nidx, 
! 		    const NrrdKernel *kern, double *kparm,
  		    double hh, double ss, double tt, double cx, double cy) {
    float *wght, *in, pp, pf, tmp;
***************
*** 812,816 ****
  _tenEpiRegWarp(Nrrd **ndone, Nrrd *npxfr, Nrrd *nhst, Nrrd *ngrad,
  	       Nrrd **nin, int ninLen,
! 	       int reference, NrrdKernel *kern, double *kparm,
  	       int verb) {
    char me[]="_tenEpiRegWarp", err[AIR_STRLEN_MED];
--- 812,816 ----
  _tenEpiRegWarp(Nrrd **ndone, Nrrd *npxfr, Nrrd *nhst, Nrrd *ngrad,
  	       Nrrd **nin, int ninLen,
! 	       int reference, const NrrdKernel *kern, double *kparm,
  	       int verb) {
    char me[]="_tenEpiRegWarp", err[AIR_STRLEN_MED];
***************
*** 879,883 ****
  		 float bwX, float bwY, float fitFrac,
  		 float DWthr, int doCC, 
! 		 NrrdKernel *kern, double *kparm,
  		 int progress, int verbose) {
    char me[]="tenEpiRegister3D", err[AIR_STRLEN_MED];
--- 879,883 ----
  		 float bwX, float bwY, float fitFrac,
  		 float DWthr, int doCC, 
! 		 const NrrdKernel *kern, double *kparm,
  		 int progress, int verbose) {
    char me[]="tenEpiRegister3D", err[AIR_STRLEN_MED];
***************
*** 1015,1019 ****
  		 float bwX, float bwY, float fitFrac,
  		 float DWthr, int doCC, 
! 		 NrrdKernel *kern, double *kparm,
  		 int progress, int verbose) {
    char me[]="tenEpiRegister4D", err[AIR_STRLEN_MED];
--- 1015,1019 ----
  		 float bwX, float bwY, float fitFrac,
  		 float DWthr, int doCC, 
! 		 const NrrdKernel *kern, double *kparm,
  		 int progress, int verbose) {
    char me[]="tenEpiRegister4D", err[AIR_STRLEN_MED];

Index: fiberMethods.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/fiberMethods.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fiberMethods.c	7 Jan 2004 15:34:31 -0000	1.12
--- fiberMethods.c	16 Jan 2004 17:35:12 -0000	1.13
***************
*** 59,63 ****
    tenFiberContext *tfx;
    gagePerVolume *pvl;
!   NrrdKernel *kernel;
    double kparm[NRRD_KERNEL_PARMS_NUM];
    
--- 59,63 ----
    tenFiberContext *tfx;
    gagePerVolume *pvl;
!   const NrrdKernel *kernel;
    double kparm[NRRD_KERNEL_PARMS_NUM];
    
***************
*** 232,236 ****
  int
  tenFiberKernelSet(tenFiberContext *tfx,
! 		  NrrdKernel *kern,
  		  double parm[NRRD_KERNEL_PARMS_NUM]) {
    char me[]="tenFiberKernelSet", err[AIR_STRLEN_MED];
--- 232,236 ----
  int
  tenFiberKernelSet(tenFiberContext *tfx,
! 		  const NrrdKernel *kern,
  		  double parm[NRRD_KERNEL_PARMS_NUM]) {
    char me[]="tenFiberKernelSet", err[AIR_STRLEN_MED];

Index: ten.h
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/ten.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** ten.h	7 Jan 2004 15:34:31 -0000	1.69
--- ten.h	16 Jan 2004 17:35:12 -0000	1.70
***************
*** 409,413 ****
  extern int tenFiberTypeSet(tenFiberContext *tfx, int type);
  extern int tenFiberKernelSet(tenFiberContext *tfx,
! 			     NrrdKernel *kern,
  			     double parm[NRRD_KERNEL_PARMS_NUM]);
  extern int tenFiberIntgSet(tenFiberContext *tfx, int intg);
--- 409,413 ----
  extern int tenFiberTypeSet(tenFiberContext *tfx, int type);
  extern int tenFiberKernelSet(tenFiberContext *tfx,
! 			     const NrrdKernel *kern,
  			     double parm[NRRD_KERNEL_PARMS_NUM]);
  extern int tenFiberIntgSet(tenFiberContext *tfx, int intg);
***************
*** 427,431 ****
  			    float bwX, float bwY, float fitFrac, float DWthr,
  			    int doCC,
! 			    NrrdKernel *kern, double *kparm,
  			    int progress, int verbose);
  extern int tenEpiRegister4D(Nrrd *nout, Nrrd *nin, Nrrd *ngrad,
--- 427,431 ----
  			    float bwX, float bwY, float fitFrac, float DWthr,
  			    int doCC,
! 			    const NrrdKernel *kern, double *kparm,
  			    int progress, int verbose);
  extern int tenEpiRegister4D(Nrrd *nout, Nrrd *nin, Nrrd *ngrad,
***************
*** 433,437 ****
  			    float bwX, float bwY, float fitFrac,
  			    float DWthr, int doCC, 
! 			    NrrdKernel *kern, double *kparm,
  			    int progress, int verbose);
  
--- 433,437 ----
  			    float bwX, float bwY, float fitFrac,
  			    float DWthr, int doCC, 
! 			    const NrrdKernel *kern, double *kparm,
  			    int progress, int verbose);
  

Index: tenGage.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tenGage.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tenGage.c	7 Jan 2004 15:34:31 -0000	1.9
--- tenGage.c	16 Jan 2004 17:35:12 -0000	1.10
***************
*** 160,164 ****
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_2(0); DOIT_2(1); DOIT_2(2); DOIT_2(3); DOIT_2(4); DOIT_2(5); DOIT_2(6); 
      break;
    case 4:
--- 160,165 ----
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_2(0); DOIT_2(1); DOIT_2(2); DOIT_2(3);
!     DOIT_2(4); DOIT_2(5); DOIT_2(6); 
      break;
    case 4:
***************
*** 168,172 ****
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_4(0); DOIT_4(1); DOIT_4(2); DOIT_4(3); DOIT_4(4); DOIT_4(5); DOIT_4(6); 
      break;
    default:
--- 169,174 ----
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_4(0); DOIT_4(1); DOIT_4(2); DOIT_4(3);
!     DOIT_4(4); DOIT_4(5); DOIT_4(6); 
      break;
    default:
***************
*** 178,182 ****
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_N(0); DOIT_N(1); DOIT_N(2); DOIT_N(3); DOIT_N(4); DOIT_N(5); DOIT_N(6); 
      break;
    }
--- 180,185 ----
                         tensor + J, tgrad + J*3, NULL, \
  		       pvl->needD[0], pvl->needD[1], AIR_FALSE)
!     DOIT_N(0); DOIT_N(1); DOIT_N(2); DOIT_N(3);
!     DOIT_N(4); DOIT_N(5); DOIT_N(6); 
      break;
    }