[Teem-commit] teem/src/nrrd nrrdDefines.h,1.30,1.31 parseNrrd.c,1.31,1.32

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

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

Modified Files:
	nrrdDefines.h parseNrrd.c 
Log Message:
Can now use "none" as well as "???" to signify no (or unknown) kinds
and centers


Index: parseNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/parseNrrd.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** parseNrrd.c	23 Jan 2005 22:55:08 -0000	1.31
--- parseNrrd.c	24 Jan 2005 01:55:14 -0000	1.32
***************
*** 453,456 ****
--- 453,460 ----
        continue;
      }
+     if (!strcmp(tok, NRRD_NONE)) {
+       nrrd->axis[i].center = nrrdCenterUnknown;
+       continue;
+     }
      if (!(nrrd->axis[i].center = airEnumVal(nrrdCenter, tok))) {
        sprintf(err, "%s: couldn't parse center \"%s\" for axis %d",
***************
*** 494,497 ****
--- 498,505 ----
        continue;
      }
+     if (!strcmp(tok, NRRD_NONE)) {
+       nrrd->axis[i].center = nrrdKindUnknown;
+       continue;
+     }
      if (!(nrrd->axis[i].kind = airEnumVal(nrrdKind, tok))) {
        sprintf(err, "%s: couldn't parse \"%s\" kind %d of %d",

Index: nrrdDefines.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrdDefines.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** nrrdDefines.h	23 Jan 2005 00:49:20 -0000	1.30
--- nrrdDefines.h	24 Jan 2005 01:55:14 -0000	1.31
***************
*** 117,120 ****
--- 117,122 ----
                                           a field of the nrrd header, when it
                                           being unknown is not an error */
+ #define NRRD_NONE "none"              /* like NRRD_UNKNOWN, but with an air
+                                          of certainty */
  
  #ifdef __cplusplus