Menu
▾
▴
[Teem-commit] teem/src/unrrdu data.c,1.10,1.11 head.c,1.18,1.19 make.c,1.46,1.47 minmax.c,1.7,1.8 save.c,1.39,1.40
|
From: <kin...@us...> - 2003-11-29 08:16:10
|
Update of /cvsroot/teem/teem/src/unrrdu
In directory sc8-pr-cvs1:/tmp/cvs-serv5594/unrrdu
Modified Files:
data.c head.c make.c minmax.c save.c
Log Message:
API RENAME: NrrdIO --> NrrdIoState
Index: data.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/data.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** data.c 24 Sep 2003 07:23:55 -0000 1.10
--- data.c 29 Nov 2003 08:16:06 -0000 1.11
***************
*** 22,26 ****
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIO *io, FILE *file);
#define INFO "Print data segment of a nrrd file"
--- 22,26 ----
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIoState *io, FILE *file);
#define INFO "Print data segment of a nrrd file"
***************
*** 43,47 ****
char *err, *inS=NULL;
Nrrd *nin;
! NrrdIO *nio;
airArray *mop;
int car, pret;
--- 43,47 ----
char *err, *inS=NULL;
Nrrd *nin;
! NrrdIoState *nio;
airArray *mop;
int car, pret;
***************
*** 56,61 ****
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
! nio = nrrdIONew();
! airMopAdd(mop, nio, (airMopper)nrrdIONix, airMopAlways);
nio->skipData = AIR_TRUE;
nio->keepNrrdDataFileOpen = AIR_TRUE;
--- 56,61 ----
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
! nio = nrrdIoStateNew();
! airMopAdd(mop, nio, (airMopper)nrrdIoStateNix, airMopAlways);
nio->skipData = AIR_TRUE;
nio->keepNrrdDataFileOpen = AIR_TRUE;
Index: head.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/head.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** head.c 6 Oct 2003 12:25:18 -0000 1.18
--- head.c 29 Nov 2003 08:16:06 -0000 1.19
***************
*** 22,26 ****
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIO *io, FILE *file);
#define INFO "Print header of one or more nrrd files"
--- 22,26 ----
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIoState *io, FILE *file);
#define INFO "Print header of one or more nrrd files"
***************
*** 33,37 ****
int
! unrrdu_headDoit(char *me, NrrdIO *io, char *inS, FILE *fout) {
char err[AIR_STRLEN_MED];
airArray *mop;
--- 33,37 ----
int
! unrrdu_headDoit(char *me, NrrdIoState *io, char *inS, FILE *fout) {
char err[AIR_STRLEN_MED];
airArray *mop;
***************
*** 83,87 ****
hestOpt *opt = NULL;
char *err, **inS;
! NrrdIO *io;
airArray *mop;
int pret, ni, ninLen;
--- 83,87 ----
hestOpt *opt = NULL;
char *err, **inS;
! NrrdIoState *io;
airArray *mop;
int pret, ni, ninLen;
***************
*** 99,104 ****
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
! io = nrrdIONew();
! airMopAdd(mop, io, (airMopper)nrrdIONix, airMopAlways);
for (ni=0; ni<ninLen; ni++) {
--- 99,104 ----
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
! io = nrrdIoStateNew();
! airMopAdd(mop, io, (airMopper)nrrdIoStateNix, airMopAlways);
for (ni=0; ni<ninLen; ni++) {
Index: make.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/make.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** make.c 4 Oct 2003 10:45:00 -0000 1.46
--- make.c 29 Nov 2003 08:16:06 -0000 1.47
***************
*** 22,26 ****
/* bad Gordon */
! extern int _nrrdReadNrrdParse_keyvalue(Nrrd *nrrd, NrrdIO *io, int useBiff);
#define INFO "Create a nrrd (or nrrd header) from scratch"
--- 22,27 ----
/* bad Gordon */
! extern int _nrrdReadNrrdParse_keyvalue(Nrrd *nrrd, NrrdIoState *io,
! int useBiff);
#define INFO "Create a nrrd (or nrrd header) from scratch"
***************
*** 42,50 ****
int
! unrrduMakeRead(char *me, Nrrd *nrrd, NrrdIO *nio, const char *fname,
int lineSkip, int byteSkip, const NrrdEncoding *encoding) {
char err[AIR_STRLEN_MED];
! nrrdIOInit(nio);
nio->lineSkip = lineSkip;
nio->byteSkip = byteSkip;
--- 43,51 ----
int
! unrrduMakeRead(char *me, Nrrd *nrrd, NrrdIoState *nio, const char *fname,
int lineSkip, int byteSkip, const NrrdEncoding *encoding) {
char err[AIR_STRLEN_MED];
! nrrdIoStateInit(nio);
nio->lineSkip = lineSkip;
nio->byteSkip = byteSkip;
***************
*** 84,88 ****
double *spacing;
airArray *mop;
! NrrdIO *nio;
FILE *fileOut;
char **label;
--- 85,89 ----
double *spacing;
airArray *mop;
! NrrdIoState *nio;
FILE *fileOut;
char **label;
***************
*** 95,100 ****
mop = airMopNew();
! nio = nrrdIONew();
! airMopAdd(mop, nio, (airMopper)nrrdIONix, airMopAlways);
nrrd = nrrdNew();
airMopAdd(mop, nrrd, (airMopper)nrrdNuke, airMopAlways);
--- 96,101 ----
mop = airMopNew();
! nio = nrrdIoStateNew();
! airMopAdd(mop, nio, (airMopper)nrrdIoStateNix, airMopAlways);
nrrd = nrrdNew();
airMopAdd(mop, nrrd, (airMopper)nrrdNuke, airMopAlways);
***************
*** 174,178 ****
encoding = nrrdEncodingArray[encodingType];
! /* given the information we have, we set the fields in the nrrdIO
so as to simulate having read the information from a header */
if (!( AIR_IN_CL(1, sizeLen, NRRD_DIM_MAX) )) {
--- 175,179 ----
encoding = nrrdEncodingArray[encodingType];
! /* given the information we have, we set the fields in the nrrdIoState
so as to simulate having read the information from a header */
if (!( AIR_IN_CL(1, sizeLen, NRRD_DIM_MAX) )) {
***************
*** 218,226 ****
if (kvpLen) {
for (ki=0; ki<kvpLen; ki++) {
! /* a hack: have to use NrrdIO->line as the channel to communicate
the key/value pair, since we have to emulate it having been
read from a NRRD header. But because nio doesn't own the
memory, we must be careful to unset the pointer prior to
! NrrdIONuke being called by the mop. */
nio->line = kvp[ki];
if (_nrrdReadNrrdParse_keyvalue (nrrd, nio, AIR_TRUE)) {
--- 219,227 ----
if (kvpLen) {
for (ki=0; ki<kvpLen; ki++) {
! /* a hack: have to use NrrdIoState->line as the channel to communicate
the key/value pair, since we have to emulate it having been
read from a NRRD header. But because nio doesn't own the
memory, we must be careful to unset the pointer prior to
! NrrdIoStateNix being called by the mop. */
nio->line = kvp[ki];
if (_nrrdReadNrrdParse_keyvalue (nrrd, nio, AIR_TRUE)) {
Index: minmax.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/minmax.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** minmax.c 3 Oct 2003 18:59:10 -0000 1.7
--- minmax.c 29 Nov 2003 08:16:06 -0000 1.8
***************
*** 22,26 ****
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIO *io, FILE *file);
#define INFO "Print out min and max values in one or more nrrds"
--- 22,26 ----
/* bad bad bad Gordon */
! extern int _nrrdOneLine(int *lenP, NrrdIoState *io, FILE *file);
#define INFO "Print out min and max values in one or more nrrds"
Index: save.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/save.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** save.c 24 Sep 2003 06:07:01 -0000 1.39
--- save.c 29 Nov 2003 08:16:06 -0000 1.40
***************
*** 22,26 ****
/* bad bad bad Gordon */
! extern void _nrrdGuessFormat(NrrdIO *io, const char *filename);
#define INFO "Write nrrd with specific format, encoding, or endianness"
--- 22,26 ----
/* bad bad bad Gordon */
! extern void _nrrdGuessFormat(NrrdIoState *io, const char *filename);
#define INFO "Write nrrd with specific format, encoding, or endianness"
***************
*** 40,49 ****
Nrrd *nin, *nout;
airArray *mop;
! NrrdIO *nio;
int pret, enc[3], formatType;
mop = airMopNew();
! nio = nrrdIONew();
! airMopAdd(mop, nio, (airMopper)nrrdIONix, airMopAlways);
strcpy(fmtInfo,
--- 40,49 ----
Nrrd *nin, *nout;
airArray *mop;
! NrrdIoState *nio;
int pret, enc[3], formatType;
mop = airMopNew();
! nio = nrrdIoStateNew();
! airMopAdd(mop, nio, (airMopper)nrrdIoStateNix, airMopAlways);
strcpy(fmtInfo,
|
