[Teem-commit] teem/src/moss moss.h,1.18,1.19 sampler.c,1.9,1.10

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

Update of /cvsroot/teem/teem/src/moss
In directory sc8-pr-cvs1:/tmp/cvs-serv24152/moss

Modified Files:
	moss.h sampler.c 
Log Message:
NrrdKernels now const-correct

Index: moss.h
===================================================================
RCS file: /cvsroot/teem/teem/src/moss/moss.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** moss.h	7 Jan 2004 15:34:30 -0000	1.18
--- moss.h	16 Jan 2004 17:40:14 -0000	1.19
***************
*** 60,64 ****
  typedef struct {
    Nrrd *image;                         /* the image to sample */
!   NrrdKernel *kernel;                  /* which kernel to use on both axes */
    double kparm[NRRD_KERNEL_PARMS_NUM]; /* kernel arguments */
    float *ivc;                          /* intermediate value cache */
--- 60,64 ----
  typedef struct {
    Nrrd *image;                         /* the image to sample */
!   const NrrdKernel *kernel;            /* which kernel to use on both axes */
    double kparm[NRRD_KERNEL_PARMS_NUM]; /* kernel arguments */
    float *ivc;                          /* intermediate value cache */
***************
*** 91,95 ****
  extern int mossSamplerImageSet(mossSampler *smplr, Nrrd *image, float *bg);
  extern int mossSamplerKernelSet(mossSampler *smplr,
! 				NrrdKernel *kernel, double *kparm);
  extern int mossSamplerUpdate(mossSampler *smplr);
  extern int mossSamplerSample(float *val, mossSampler *smplr,
--- 91,95 ----
  extern int mossSamplerImageSet(mossSampler *smplr, Nrrd *image, float *bg);
  extern int mossSamplerKernelSet(mossSampler *smplr,
! 				const NrrdKernel *kernel, double *kparm);
  extern int mossSamplerUpdate(mossSampler *smplr);
  extern int mossSamplerSample(float *val, mossSampler *smplr,

Index: sampler.c
===================================================================
RCS file: /cvsroot/teem/teem/src/moss/sampler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sampler.c	7 Jan 2004 15:34:30 -0000	1.9
--- sampler.c	16 Jan 2004 17:40:14 -0000	1.10
***************
*** 48,52 ****
  
  int
! mossSamplerKernelSet (mossSampler *smplr, NrrdKernel *kernel, double *kparm) {
    char me[]="mossSamplerKernelSet", err[AIR_STRLEN_MED];
    int i;
--- 48,53 ----
  
  int
! mossSamplerKernelSet (mossSampler *smplr, 
! 		      const NrrdKernel *kernel, double *kparm) {
    char me[]="mossSamplerKernelSet", err[AIR_STRLEN_MED];
    int i;