|
From: <kin...@us...> - 2003-12-21 07:19:29
|
Update of /cvsroot/teem/teem/src/nrrd
In directory sc8-pr-cvs1:/tmp/cvs-serv4415/nrrd
Modified Files:
defaultsNrrd.c nrrd.h simple.c
Log Message:
yet more NrrdIO related changes
Index: defaultsNrrd.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/defaultsNrrd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** defaultsNrrd.c 14 Nov 2003 17:54:05 -0000 1.13
--- defaultsNrrd.c 21 Dec 2003 07:19:25 -0000 1.14
***************
*** 39,50 ****
int nrrdDefWriteCharsPerLine = 75;
int nrrdDefWriteValsPerLine = 8;
int nrrdDefRsmpBoundary = nrrdBoundaryBleed;
int nrrdDefRsmpType = nrrdTypeDefault;
double nrrdDefRsmpScale = 1.0; /* these two should probably be the same */
- double nrrdDefKernelParm0 = 1.0;
int nrrdDefRsmpRenormalize = AIR_TRUE;
int nrrdDefRsmpRound = AIR_TRUE;
int nrrdDefRsmpClamp = AIR_TRUE;
double nrrdDefRsmpPadValue = 0.0;
int nrrdDefCenter = nrrdCenterNode;
double nrrdDefSpacing = 1.0;
--- 39,52 ----
int nrrdDefWriteCharsPerLine = 75;
int nrrdDefWriteValsPerLine = 8;
+ /* ---- BEGIN non-NrrdIO */
int nrrdDefRsmpBoundary = nrrdBoundaryBleed;
int nrrdDefRsmpType = nrrdTypeDefault;
double nrrdDefRsmpScale = 1.0; /* these two should probably be the same */
int nrrdDefRsmpRenormalize = AIR_TRUE;
int nrrdDefRsmpRound = AIR_TRUE;
int nrrdDefRsmpClamp = AIR_TRUE;
double nrrdDefRsmpPadValue = 0.0;
+ double nrrdDefKernelParm0 = 1.0;
+ /* ---- END non-NrrdIO */
int nrrdDefCenter = nrrdCenterNode;
double nrrdDefSpacing = 1.0;
***************
*** 55,66 ****
set them differently. */
int nrrdStateVerboseIO = 1;
int nrrdStateBlind8BitRange = AIR_TRUE;
int nrrdStateMeasureType = nrrdTypeFloat;
int nrrdStateMeasureModeBins = 1024;
int nrrdStateMeasureHistoType = nrrdTypeFloat;
int nrrdStateAlwaysSetContent = AIR_TRUE;
int nrrdStateDisableContent = AIR_FALSE;
char *nrrdStateUnknownContent = NRRD_UNKNOWN;
- int nrrdStateDisallowIntegerNonExist = AIR_TRUE;
int nrrdStateGrayscaleImage3D = AIR_FALSE;
/* there is no sane reason to change this default initialization */
--- 57,70 ----
set them differently. */
int nrrdStateVerboseIO = 1;
+ /* ---- BEGIN non-NrrdIO */
int nrrdStateBlind8BitRange = AIR_TRUE;
int nrrdStateMeasureType = nrrdTypeFloat;
int nrrdStateMeasureModeBins = 1024;
int nrrdStateMeasureHistoType = nrrdTypeFloat;
+ int nrrdStateDisallowIntegerNonExist = AIR_TRUE;
+ /* ---- END non-NrrdIO */
int nrrdStateAlwaysSetContent = AIR_TRUE;
int nrrdStateDisableContent = AIR_FALSE;
char *nrrdStateUnknownContent = NRRD_UNKNOWN;
int nrrdStateGrayscaleImage3D = AIR_FALSE;
/* there is no sane reason to change this default initialization */
***************
*** 73,76 ****
--- 77,81 ----
stand to be user-controllable? */
+ /* ---- BEGIN non-NrrdIO */
void
nrrdDefGetenv(void) {
***************
*** 125,126 ****
--- 130,132 ----
}
+ /* ---- END non-NrrdIO */
Index: nrrd.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrd.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** nrrd.h 21 Dec 2003 02:43:07 -0000 1.129
--- nrrd.h 21 Dec 2003 07:19:25 -0000 1.130
***************
*** 428,431 ****
--- 428,432 ----
extern nrrd_export int nrrdDefWriteCharsPerLine;
extern nrrd_export int nrrdDefWriteValsPerLine;
+ /* ---- BEGIN non-NrrdIO */
extern nrrd_export int nrrdDefRsmpBoundary;
extern nrrd_export int nrrdDefRsmpType;
***************
*** 435,454 ****
extern nrrd_export int nrrdDefRsmpClamp;
extern nrrd_export double nrrdDefRsmpPadValue;
extern nrrd_export int nrrdDefCenter;
extern nrrd_export double nrrdDefSpacing;
- extern nrrd_export double nrrdDefKernelParm0;
extern nrrd_export int nrrdStateVerboseIO;
extern nrrd_export int nrrdStateBlind8BitRange;
extern nrrd_export int nrrdStateMeasureType;
extern nrrd_export int nrrdStateMeasureModeBins;
extern nrrd_export int nrrdStateMeasureHistoType;
extern nrrd_export int nrrdStateAlwaysSetContent;
extern nrrd_export int nrrdStateDisableContent;
extern nrrd_export char *nrrdStateUnknownContent;
- extern nrrd_export int nrrdStateDisallowIntegerNonExist;
extern nrrd_export int nrrdStateGrayscaleImage3D;
extern nrrd_export int nrrdStateKeyValueReturnInternalPointers;
extern void nrrdDefGetenv(void);
extern void nrrdStateGetenv(void);
/******** all the airEnums used through-out nrrd */
--- 436,460 ----
extern nrrd_export int nrrdDefRsmpClamp;
extern nrrd_export double nrrdDefRsmpPadValue;
+ extern nrrd_export double nrrdDefKernelParm0;
+ /* ---- END non-NrrdIO */
extern nrrd_export int nrrdDefCenter;
extern nrrd_export double nrrdDefSpacing;
extern nrrd_export int nrrdStateVerboseIO;
+ /* ---- BEGIN non-NrrdIO */
extern nrrd_export int nrrdStateBlind8BitRange;
extern nrrd_export int nrrdStateMeasureType;
extern nrrd_export int nrrdStateMeasureModeBins;
extern nrrd_export int nrrdStateMeasureHistoType;
+ extern nrrd_export int nrrdStateDisallowIntegerNonExist;
+ /* ---- END non-NrrdIO */
extern nrrd_export int nrrdStateAlwaysSetContent;
extern nrrd_export int nrrdStateDisableContent;
extern nrrd_export char *nrrdStateUnknownContent;
extern nrrd_export int nrrdStateGrayscaleImage3D;
extern nrrd_export int nrrdStateKeyValueReturnInternalPointers;
+ /* ---- BEGIN non-NrrdIO */
extern void nrrdDefGetenv(void);
extern void nrrdStateGetenv(void);
+ /* ---- END non-NrrdIO */
/******** all the airEnums used through-out nrrd */
Index: simple.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/simple.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** simple.c 1 Dec 2003 09:21:21 -0000 1.57
--- simple.c 21 Dec 2003 07:19:25 -0000 1.58
***************
*** 582,585 ****
--- 582,586 ----
biffAdd(NRRD, err); return 0;
}
+ /* ---- BEGIN non-NrrdIO */
if (!( nrrdTypeDefault == nrrdDefRsmpType
|| !airEnumValCheck(nrrdType, nrrdDefRsmpType) )) {
***************
*** 589,593 ****
biffAdd(NRRD, err); return 0;
}
- /* ---- BEGIN non-NrrdIO */
if (airEnumValCheck(nrrdBoundary, nrrdDefRsmpBoundary)) {
sprintf(err, "%s: nrrdDefRsmpBoundary (%d) not in valid range [%d,%d]",
--- 590,593 ----
|