|
From: <kin...@us...> - 2003-11-29 08:16:11
|
Update of /cvsroot/teem/teem/src/nrrd/test
In directory sc8-pr-cvs1:/tmp/cvs-serv5594/nrrd/test
Modified Files:
io.c kv.c tline.c
Log Message:
API RENAME: NrrdIO --> NrrdIoState
Index: io.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/test/io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** io.c 30 Sep 2003 08:25:47 -0000 1.8
--- io.c 29 Nov 2003 08:16:07 -0000 1.9
***************
*** 32,36 ****
char *me, *err;
Nrrd *nrrd;
! NrrdIO *io;
me = argv[0];
--- 32,36 ----
char *me, *err;
Nrrd *nrrd;
! NrrdIoState *io;
me = argv[0];
***************
*** 38,42 ****
usage(me);
! io = nrrdIONew();
nrrdStateVerboseIO = 10;
--- 38,42 ----
usage(me);
! io = nrrdIoStateNew();
nrrdStateVerboseIO = 10;
***************
*** 54,58 ****
exit(1);
}
! nrrdIOInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
--- 54,58 ----
exit(1);
}
! nrrdIoStateInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
***************
*** 61,65 ****
exit(1);
}
! nrrdIOInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
--- 61,65 ----
exit(1);
}
! nrrdIoStateInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
***************
*** 68,72 ****
exit(1);
}
! nrrdIOInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
--- 68,72 ----
exit(1);
}
! nrrdIoStateInit(io);
if (nrrdSave(argv[2], nrrd, io)) {
fprintf(stderr, "%s: trouble saving \"%s\":\n%s",
***************
*** 77,81 ****
! nrrdIONix(io);
nrrdNuke(nrrd);
--- 77,81 ----
! nrrdIoStateNix(io);
nrrdNuke(nrrd);
Index: kv.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/test/kv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kv.c 3 Nov 2003 03:28:29 -0000 1.3
--- kv.c 29 Nov 2003 08:16:07 -0000 1.4
***************
*** 32,36 ****
char *me, *err, *key="strong bad", *value;
Nrrd *nrrd;
! NrrdIO *io;
me = argv[0];
--- 32,36 ----
char *me, *err, *key="strong bad", *value;
Nrrd *nrrd;
! NrrdIoState *io;
me = argv[0];
***************
*** 38,42 ****
usage(me);
! io = nrrdIONew();
nrrdStateVerboseIO = 10;
--- 38,42 ----
usage(me);
! io = nrrdIoStateNew();
nrrdStateVerboseIO = 10;
***************
*** 55,59 ****
}
! nrrdIONix(io);
nrrdNuke(nrrd);
--- 55,59 ----
}
! nrrdIoStateNix(io);
nrrdNuke(nrrd);
Index: tline.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/test/tline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tline.c 23 Jul 2003 01:20:29 -0000 1.2
--- tline.c 29 Nov 2003 08:16:07 -0000 1.3
***************
*** 20,24 ****
#include "../nrrd.h"
! extern int _nrrdOneLine(int *lenP, NrrdIO *io, FILE *file);
FILE *
--- 20,24 ----
#include "../nrrd.h"
! extern int _nrrdOneLine(int *lenP, NrrdIoState *io, FILE *file);
FILE *
***************
*** 47,51 ****
FILE *file;
int len;
! NrrdIO *io;
me = argv[0];
--- 47,51 ----
FILE *file;
int len;
! NrrdIoState *io;
me = argv[0];
***************
*** 60,64 ****
exit(1);
}
! io = nrrdIONew();
do {
if (_nrrdOneLine(&len, io, file)) {
--- 60,64 ----
exit(1);
}
! io = nrrdIoStateNew();
do {
if (_nrrdOneLine(&len, io, file)) {
***************
*** 70,74 ****
}
} while(len > 0);
! nrrdIONix(io);
myclose(file);
--- 70,74 ----
}
} while(len > 0);
! nrrdIoStateNix(io);
myclose(file);
|