|
From: <kin...@us...> - 2003-12-19 03:38:22
|
Update of /cvsroot/teem/teem/src/nrrd
In directory sc8-pr-cvs1:/tmp/cvs-serv16303
Modified Files:
parseNrrd.c
Log Message:
nothing, just variable renaming
Index: parseNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/parseNrrd.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** parseNrrd.c 29 Nov 2003 08:16:07 -0000 1.19
--- parseNrrd.c 19 Dec 2003 03:38:18 -0000 1.20
***************
*** 22,26 ****
int
! _nrrdReadNrrdParse_nonfield (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
/*
char c;
--- 22,26 ----
int
! _nrrdReadNrrdParse_nonfield (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
/*
char c;
***************
*** 36,45 ****
int
! _nrrdReadNrrdParse_comment (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_comment", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
! /* this skips the '#' at io->line[io->pos] and any other ' ' and '#' */
if (nrrdCommentAdd(nrrd, info)) {
sprintf(err, "%s: trouble adding comment", me);
--- 36,45 ----
int
! _nrrdReadNrrdParse_comment (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_comment", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
! /* this skips the '#' at nio->line[nio->pos] and any other ' ' and '#' */
if (nrrdCommentAdd(nrrd, info)) {
sprintf(err, "%s: trouble adding comment", me);
***************
*** 50,58 ****
int
! _nrrdReadNrrdParse_type (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_type", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
if (!(nrrd->type = airEnumVal(nrrdType, info))) {
sprintf(err, "%s: couldn't parse type \"%s\"", me, info);
--- 50,58 ----
int
! _nrrdReadNrrdParse_type (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_type", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
if (!(nrrd->type = airEnumVal(nrrdType, info))) {
sprintf(err, "%s: couldn't parse type \"%s\"", me, info);
***************
*** 63,72 ****
int
! _nrrdReadNrrdParse_encoding (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_encoding", err[AIR_STRLEN_MED];
char *info;
int etype;
! info = io->line + io->pos;
if (!(etype = airEnumVal(nrrdEncodingType, info))) {
sprintf(err, "%s: couldn't parse encoding \"%s\"", me, info);
--- 63,72 ----
int
! _nrrdReadNrrdParse_encoding (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_encoding", err[AIR_STRLEN_MED];
char *info;
int etype;
! info = nio->line + nio->pos;
if (!(etype = airEnumVal(nrrdEncodingType, info))) {
sprintf(err, "%s: couldn't parse encoding \"%s\"", me, info);
***************
*** 74,88 ****
}
! io->encoding = nrrdEncodingArray[etype];
return 0;
}
int
! _nrrdReadNrrdParse_endian (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_endian", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
! if (!(io->endian = airEnumVal(airEndian, info))) {
sprintf(err, "%s: couldn't parse endian \"%s\"", me, info);
biffMaybeAdd(NRRD, err, useBiff); return 1;
--- 74,88 ----
}
! nio->encoding = nrrdEncodingArray[etype];
return 0;
}
int
! _nrrdReadNrrdParse_endian (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_endian", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
! if (!(nio->endian = airEnumVal(airEndian, info))) {
sprintf(err, "%s: couldn't parse endian \"%s\"", me, info);
biffMaybeAdd(NRRD, err, useBiff); return 1;
***************
*** 98,106 ****
int
! _nrrdReadNrrdParse_dimension (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_dimension", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
_PARSE_ONE_VAL(nrrd->dim, "%d", "int");
if (!AIR_IN_CL(1, nrrd->dim, NRRD_DIM_MAX)) {
--- 98,106 ----
int
! _nrrdReadNrrdParse_dimension (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_dimension", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
_PARSE_ONE_VAL(nrrd->dim, "%d", "int");
if (!AIR_IN_CL(1, nrrd->dim, NRRD_DIM_MAX)) {
***************
*** 131,140 ****
int
! _nrrdReadNrrdParse_sizes (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_sizes", err[AIR_STRLEN_MED];
int ret, val[NRRD_DIM_MAX];
char *info;
! info = io->line + io->pos;
_CHECK_HAVE_DIM;
ret = airParseStrI(val, info, _nrrdFieldSep, nrrd->dim);
--- 131,140 ----
int
! _nrrdReadNrrdParse_sizes (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_sizes", err[AIR_STRLEN_MED];
int ret, val[NRRD_DIM_MAX];
char *info;
! info = nio->line + nio->pos;
_CHECK_HAVE_DIM;
ret = airParseStrI(val, info, _nrrdFieldSep, nrrd->dim);
***************
*** 149,153 ****
int
! _nrrdReadNrrdParse_spacings (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_spacings", err[AIR_STRLEN_MED];
int i, ret;
--- 149,153 ----
int
! _nrrdReadNrrdParse_spacings (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_spacings", err[AIR_STRLEN_MED];
int i, ret;
***************
*** 155,159 ****
char *info;
! info = io->line + io->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
--- 155,159 ----
char *info;
! info = nio->line + nio->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
***************
*** 170,174 ****
int
! _nrrdReadNrrdParse_axis_mins (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_axis_mins", err[AIR_STRLEN_MED];
int ret, i, sgn;
--- 170,174 ----
int
! _nrrdReadNrrdParse_axis_mins (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_axis_mins", err[AIR_STRLEN_MED];
int ret, i, sgn;
***************
*** 176,180 ****
char *info;
! info = io->line + io->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
--- 176,180 ----
char *info;
! info = nio->line + nio->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
***************
*** 191,195 ****
int
! _nrrdReadNrrdParse_axis_maxs (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_axis_maxs", err[AIR_STRLEN_MED];
int ret, i, sgn;
--- 191,195 ----
int
! _nrrdReadNrrdParse_axis_maxs (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_axis_maxs", err[AIR_STRLEN_MED];
int ret, i, sgn;
***************
*** 197,201 ****
char *info;
! info = io->line + io->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
--- 197,201 ----
char *info;
! info = nio->line + nio->pos;
_CHECK_HAVE_DIM;
ret = airParseStrD(val, info, _nrrdFieldSep, nrrd->dim);
***************
*** 215,219 ****
*/
int
! _nrrdReadNrrdParse_centers (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_centers", err[AIR_STRLEN_MED];
int i;
--- 215,219 ----
*/
int
! _nrrdReadNrrdParse_centers (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_centers", err[AIR_STRLEN_MED];
int i;
***************
*** 221,225 ****
char *info, *last;
! info = io->line + io->pos;
_CHECK_HAVE_DIM;
for (i=0; i<=nrrd->dim-1; i++) {
--- 221,225 ----
char *info, *last;
! info = nio->line + nio->pos;
_CHECK_HAVE_DIM;
for (i=0; i<=nrrd->dim-1; i++) {
***************
*** 305,309 ****
int
! _nrrdReadNrrdParse_labels (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_labels", err[AIR_STRLEN_MED];
char *h; /* this is the "here" pointer which gradually progresses
--- 305,309 ----
int
! _nrrdReadNrrdParse_labels (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_labels", err[AIR_STRLEN_MED];
char *h; /* this is the "here" pointer which gradually progresses
***************
*** 314,318 ****
/* because we have to correctly interpret quote marks, we
can't simply rely on airParseStrS */
! info = io->line + io->pos;
/* printf("!%s: info |%s|\n", me, info); */
_CHECK_HAVE_DIM;
--- 314,318 ----
/* because we have to correctly interpret quote marks, we
can't simply rely on airParseStrS */
! info = nio->line + nio->pos;
/* printf("!%s: info |%s|\n", me, info); */
_CHECK_HAVE_DIM;
***************
*** 330,334 ****
int
! _nrrdReadNrrdParse_units (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_unitss", err[AIR_STRLEN_MED];
char *h;
--- 330,334 ----
int
! _nrrdReadNrrdParse_units (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_unitss", err[AIR_STRLEN_MED];
char *h;
***************
*** 338,342 ****
/* because we have to correctly interpret quote marks, we
can't simply rely on airParseStrS */
! info = io->line + io->pos;
/* printf("!%s: info |%s|\n", me, info); */
_CHECK_HAVE_DIM;
--- 338,342 ----
/* because we have to correctly interpret quote marks, we
can't simply rely on airParseStrS */
! info = nio->line + nio->pos;
/* printf("!%s: info |%s|\n", me, info); */
_CHECK_HAVE_DIM;
***************
*** 354,363 ****
int
! _nrrdReadNrrdParse_number (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
/*
char me[]="_nrrdReadNrrdParse_number", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
if (1 != sscanf(info, NRRD_BIG_INT_PRINTF, &(nrrd->num))) {
sprintf(err, "%s: couldn't parse number \"%s\"", me, info);
--- 354,363 ----
int
! _nrrdReadNrrdParse_number (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
/*
char me[]="_nrrdReadNrrdParse_number", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
if (1 != sscanf(info, NRRD_BIG_INT_PRINTF, &(nrrd->num))) {
sprintf(err, "%s: couldn't parse number \"%s\"", me, info);
***************
*** 381,389 ****
int
! _nrrdReadNrrdParse_content (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_content", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
if (strlen(info) && !(nrrd->content = airStrdup(info))) {
sprintf(err, "%s: couldn't strdup() content", me);
--- 381,389 ----
int
! _nrrdReadNrrdParse_content (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_content", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
if (strlen(info) && !(nrrd->content = airStrdup(info))) {
sprintf(err, "%s: couldn't strdup() content", me);
***************
*** 394,402 ****
int
! _nrrdReadNrrdParse_block_size (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_block_size", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
/*
if (nrrdTypeBlock != nrrd->type) {
--- 394,402 ----
int
! _nrrdReadNrrdParse_block_size (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_block_size", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
/*
if (nrrdTypeBlock != nrrd->type) {
***************
*** 416,420 ****
int
! _nrrdReadNrrdParse_min (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
/* This field is no longer assumed to be anything meaningful,
--- 416,420 ----
int
! _nrrdReadNrrdParse_min (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
/* This field is no longer assumed to be anything meaningful,
***************
*** 427,431 ****
int
! _nrrdReadNrrdParse_max (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
/* nrrd->max no longer exists, see above */
--- 427,431 ----
int
! _nrrdReadNrrdParse_max (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
/* nrrd->max no longer exists, see above */
***************
*** 435,444 ****
int
! _nrrdReadNrrdParse_old_min (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_old_min", err[AIR_STRLEN_MED];
char *info;
int sgn;
! info = io->line + io->pos;
_PARSE_ONE_VAL(nrrd->oldMin, "%lg", "double");
if ((sgn=airIsInf_d(nrrd->oldMin))) {
--- 435,444 ----
int
! _nrrdReadNrrdParse_old_min (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_old_min", err[AIR_STRLEN_MED];
char *info;
int sgn;
! info = nio->line + nio->pos;
_PARSE_ONE_VAL(nrrd->oldMin, "%lg", "double");
if ((sgn=airIsInf_d(nrrd->oldMin))) {
***************
*** 450,459 ****
int
! _nrrdReadNrrdParse_old_max (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_old_max", err[AIR_STRLEN_MED];
char *info;
int sgn;
! info = io->line + io->pos;
_PARSE_ONE_VAL(nrrd->oldMax, "%lg", "double");
if ((sgn=airIsInf_d(nrrd->oldMax))) {
--- 450,459 ----
int
! _nrrdReadNrrdParse_old_max (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_old_max", err[AIR_STRLEN_MED];
char *info;
int sgn;
! info = nio->line + nio->pos;
_PARSE_ONE_VAL(nrrd->oldMax, "%lg", "double");
if ((sgn=airIsInf_d(nrrd->oldMax))) {
***************
*** 470,482 ****
** Note lack of thread-safety: strerror(errno) */
int
! _nrrdReadNrrdParse_data_file (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_data_file", err[AIR_STRLEN_MED],
dataName[AIR_STRLEN_HUGE];
char *info;
! info = io->line + io->pos;
if (!strncmp(info, _nrrdRelativePathFlag, strlen(_nrrdRelativePathFlag))) {
/* data file directory is relative to header directory */
! if (!io->path) {
sprintf(err, "%s: nrrd file refers to header-relative data file "
"\"%s\", but don't know path of header", me, info);
--- 470,482 ----
** Note lack of thread-safety: strerror(errno) */
int
! _nrrdReadNrrdParse_data_file (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_data_file", err[AIR_STRLEN_MED],
dataName[AIR_STRLEN_HUGE];
char *info;
! info = nio->line + nio->pos;
if (!strncmp(info, _nrrdRelativePathFlag, strlen(_nrrdRelativePathFlag))) {
/* data file directory is relative to header directory */
! if (!nio->path) {
sprintf(err, "%s: nrrd file refers to header-relative data file "
"\"%s\", but don't know path of header", me, info);
***************
*** 484,493 ****
}
info += strlen(_nrrdRelativePathFlag);
! sprintf(dataName, "%s/%s", io->path, info);
} else {
/* data file's name is absolute (not header-relative) */
strcpy(dataName, info);
}
! if (!(io->dataFile = fopen(dataName, "rb"))) {
sprintf(err, "%s: fopen(\"%s\",\"rb\") failed: %s",
me, dataName, strerror(errno));
--- 484,493 ----
}
info += strlen(_nrrdRelativePathFlag);
! sprintf(dataName, "%s/%s", nio->path, info);
} else {
/* data file's name is absolute (not header-relative) */
strcpy(dataName, info);
}
! if (!(nio->dataFile = fopen(dataName, "rb"))) {
sprintf(err, "%s: fopen(\"%s\",\"rb\") failed: %s",
me, dataName, strerror(errno));
***************
*** 499,510 ****
int
! _nrrdReadNrrdParse_line_skip (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_line_skip", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
! _PARSE_ONE_VAL(io->lineSkip, "%d", "int");
! if (!(0 <= io->lineSkip)) {
! sprintf(err, "%s: lineSkip value %d invalid", me, io->lineSkip);
biffMaybeAdd(NRRD, err, useBiff); return 1;
}
--- 499,510 ----
int
! _nrrdReadNrrdParse_line_skip (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_line_skip", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
! _PARSE_ONE_VAL(nio->lineSkip, "%d", "int");
! if (!(0 <= nio->lineSkip)) {
! sprintf(err, "%s: lineSkip value %d invalid", me, nio->lineSkip);
biffMaybeAdd(NRRD, err, useBiff); return 1;
}
***************
*** 513,524 ****
int
! _nrrdReadNrrdParse_byte_skip (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_byte_skip", err[AIR_STRLEN_MED];
char *info;
! info = io->line + io->pos;
! _PARSE_ONE_VAL(io->byteSkip, "%d", "int");
! if (!(-1 <= io->byteSkip)) {
! sprintf(err, "%s: byteSkip value %d invalid", me, io->byteSkip);
biffMaybeAdd(NRRD, err, useBiff); return 1;
}
--- 513,524 ----
int
! _nrrdReadNrrdParse_byte_skip (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_byte_skip", err[AIR_STRLEN_MED];
char *info;
! info = nio->line + nio->pos;
! _PARSE_ONE_VAL(nio->byteSkip, "%d", "int");
! if (!(-1 <= nio->byteSkip)) {
! sprintf(err, "%s: byteSkip value %d invalid", me, nio->byteSkip);
biffMaybeAdd(NRRD, err, useBiff); return 1;
}
***************
*** 527,536 ****
int
! _nrrdReadNrrdParse_keyvalue (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParse_keyvalue", err[AIR_STRLEN_MED];
char *keysep, *line, *key, *value;
/* we know this will find something */
! line = airStrdup(io->line);
if (!line) {
sprintf(err, "%s: can't allocate parse line", me);
--- 527,536 ----
int
! _nrrdReadNrrdParse_keyvalue (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParse_keyvalue", err[AIR_STRLEN_MED];
char *keysep, *line, *key, *value;
/* we know this will find something */
! line = airStrdup(nio->line);
if (!line) {
sprintf(err, "%s: can't allocate parse line", me);
***************
*** 597,606 ****
*/
int
! _nrrdReadNrrdParseField (Nrrd *nrrd, NrrdIoState *io, int useBiff) {
char me[]="_nrrdReadNrrdParseField", err[AIR_STRLEN_MED], *next,
*buff, *colon, *keysep;
int fld=nrrdField_unknown, noField=AIR_FALSE, badField=AIR_FALSE;
! next = io->line + io->pos;
/* determining if the line is a comment is simple */
--- 597,606 ----
*/
int
! _nrrdReadNrrdParseField (Nrrd *nrrd, NrrdIoState *nio, int useBiff) {
char me[]="_nrrdReadNrrdParseField", err[AIR_STRLEN_MED], *next,
*buff, *colon, *keysep;
int fld=nrrdField_unknown, noField=AIR_FALSE, badField=AIR_FALSE;
! next = nio->line + nio->pos;
/* determining if the line is a comment is simple */
***************
*** 655,659 ****
next += strspn(next, _nrrdFieldSep);
! io->pos = next - io->line;
return fld;
--- 655,659 ----
next += strspn(next, _nrrdFieldSep);
! nio->pos = next - nio->line;
return fld;
|