[Teem-commit] teem/src/nrrd arraysNrrd.c,1.15,1.16 nrrdEnums.h,1.43,1.44 resampleNrrd.c,1.21,1.22

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

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

Modified Files:
	arraysNrrd.c nrrdEnums.h resampleNrrd.c 
Log Message:
removed debugging messages, fixed serious bug of not updating nrrdField-related arrays

Index: resampleNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/resampleNrrd.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** resampleNrrd.c	30 Mar 2004 19:25:09 -0000	1.21
--- resampleNrrd.c	31 Mar 2004 17:56:49 -0000	1.22
***************
*** 801,806 ****
  		    | NRRD_AXIS_INFO_KIND_BIT));
    for (d=0; d<dim; d++) {
-     fprintf(stderr, "%s: nin->axis[%d].kind = %s\n", me, d,
- 	    airEnumStr(nrrdKind, nin->axis[d].kind));
      if (info->kernel[d]) {
        nout->axis[d].min = info->min[d];
--- 801,804 ----
***************
*** 814,819 ****
        nout->axis[d].kind = nin->axis[d].kind;
      }
-     fprintf(stderr, "%s: nout->axis[%d].kind = %s\n", me, d,
- 	    airEnumStr(nrrdKind, nout->axis[d].kind));
    }
    /* HEY: need to create textual representation of resampling parameters */
--- 812,815 ----

Index: arraysNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/arraysNrrd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** arraysNrrd.c	7 Jan 2004 15:34:30 -0000	1.15
--- arraysNrrd.c	31 Mar 2004 17:56:48 -0000	1.16
***************
*** 171,174 ****
--- 171,175 ----
    1, /* nrrdField_axis_maxs */
    1, /* nrrdField_centers */
+   1, /* nrrdField_kinds */
    1, /* nrrdField_labels */
    1, /* nrrdField_units */
***************
*** 203,206 ****
--- 204,208 ----
    1, /* nrrdField_axis_maxs */
    1, /* nrrdField_centers */
+   1, /* nrrdField_kinds */
    1, /* nrrdField_labels */
    1, /* nrrdField_units */
***************
*** 238,241 ****
--- 240,244 ----
    1, /* nrrdField_axis_maxs */
    1, /* nrrdField_centers */
+   1, /* nrrdField_kinds */
    1, /* nrrdField_labels */
    1, /* nrrdField_units */
***************
*** 271,274 ****
--- 274,278 ----
    0, /* nrrdField_axis maxs */
    0, /* nrrdField_centers */
+   0, /* nrrdField_kinds */
    0, /* nrrdField_labels */
    0, /* nrrdField_units */

Index: nrrdEnums.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrdEnums.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** nrrdEnums.h	30 Mar 2004 19:25:09 -0000	1.43
--- nrrdEnums.h	31 Mar 2004 17:56:48 -0000	1.44
***************
*** 246,249 ****
--- 246,256 ----
  **
  ** the various fields we can parse in a NRRD header
+ **
+ ** other things which must be kept in sync:
+ ** arraysNrrd.c: 
+ **    _nrrdFieldValidInImage[]
+ **    _nrrdFieldOnePerAxis[]
+ **    _nrrdFieldValidInText[]
+ **    _nrrdFieldRequired[]
  */
  enum {