[Teem-commit] teem/src/nrrd enumsNrrd.c,1.30,1.31 nrrd.h,1.135,1.136 nrrdEnums.h,1.41,1.42

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

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

Modified Files:
	enumsNrrd.c nrrd.h nrrdEnums.h 
Log Message:
removed the nrrdAxisInfo airEnum, since it was not being used, and clarified comment description of nrrdFormatTypeNRRD

Index: enumsNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/enumsNrrd.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** enumsNrrd.c	23 Feb 2004 18:04:15 -0000	1.30
--- enumsNrrd.c	30 Mar 2004 03:26:12 -0000	1.31
***************
*** 270,311 ****
  nrrdCenter = &_nrrdCenter_enum;
  
- /* ------------------------ nrrdAxisInfo ------------------------- */
- 
- char
- _nrrdAxisInfoStr[NRRD_AXIS_INFO_MAX+1][AIR_STRLEN_SMALL] = {
-   "(unknown_axis_info)",
-   "size",
-   "spacing",
-   "min",
-   "max",
-   "center",
-   "label",
-   "unit"
- };
- 
- char
- _nrrdAxisInfoDesc[NRRD_AXIS_INFO_MAX+1][AIR_STRLEN_MED] = {
-   "unknown axis info",
-   "number of samples along axis",
-   "spacing between samples",
-   "minimum position in \"world\" space associated with axis",
-   "maximum position in \"world\" space associated with axis",
-   "centering style for samples along this axis",
-   "short description of space or value spanned by axis",
-   "units in which sample spacing is measured"
- };
- 
- airEnum
- _nrrdAxisInfo = {
-   "axis_info",
-   NRRD_AXIS_INFO_MAX,
-   _nrrdAxisInfoStr, NULL,
-   _nrrdAxisInfoDesc,
-   NULL, NULL,
-   AIR_TRUE
- };
- airEnum *
- nrrdAxisInfo = &_nrrdAxisInfo;
-   
  /* ------------------------ nrrdField ------------------------- */
  
--- 270,273 ----

Index: nrrdEnums.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrdEnums.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** nrrdEnums.h	7 Jan 2004 15:34:30 -0000	1.41
--- nrrdEnums.h	30 Mar 2004 03:26:12 -0000	1.42
***************
*** 60,65 ****
  enum {
    nrrdFormatTypeUnknown,
!   nrrdFormatTypeNRRD,   /* 1: basic nrrd format (associated with both
! 			   magic nrrdMagicOldNRRD and nrrdMagicNRRD0001 */
    nrrdFormatTypePNM,    /* 2: PNM image */
    nrrdFormatTypePNG,    /* 3: PNG image */
--- 60,65 ----
  enum {
    nrrdFormatTypeUnknown,
!   nrrdFormatTypeNRRD,   /* 1: basic nrrd format (associated with any of
!                            the magics starting with "NRRD" */
    nrrdFormatTypePNM,    /* 2: PNM image */
    nrrdFormatTypePNG,    /* 3: PNG image */

Index: nrrd.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrd.h,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** nrrd.h	15 Mar 2004 03:07:41 -0000	1.135
--- nrrd.h	30 Mar 2004 03:26:12 -0000	1.136
***************
*** 459,463 ****
  TEEM_API airEnum *nrrdEncodingType;
  TEEM_API airEnum *nrrdCenter;
- TEEM_API airEnum *nrrdAxisInfo;
  TEEM_API airEnum *nrrdField;
  /* ---- BEGIN non-NrrdIO */
--- 459,462 ----