|
From: <kin...@us...> - 2003-12-21 02:43:10
|
Update of /cvsroot/teem/teem/src/nrrd
In directory sc8-pr-cvs1:/tmp/cvs-serv5616/nrrd
Modified Files:
accessors.c nrrd.h
Log Message:
Yet more changes and re-arrangements for NrrdIO
Index: accessors.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/accessors.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** accessors.c 12 Sep 2003 12:10:05 -0000 1.27
--- accessors.c 21 Dec 2003 02:43:07 -0000 1.28
***************
*** 182,186 ****
};
-
/*
******** nrrdSprint
--- 182,185 ----
***************
*** 223,226 ****
--- 222,227 ----
NULL};
+ /* ---- BEGIN non-NrrdIO */
+
/*
******** nrrdFprint
***************
*** 512,513 ****
--- 513,516 ----
NULL
};
+
+ /* ---- END non-NrrdIO */
Index: nrrd.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrd.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** nrrd.h 19 Dec 2003 22:32:25 -0000 1.128
--- nrrd.h 21 Dec 2003 02:43:07 -0000 1.129
***************
*** 21,24 ****
--- 21,27 ----
#define NRRD_HAS_BEEN_INCLUDED
+ #include <errno.h>
+
+ /* ---- BEGIN non-NrrdIO */
#include <stdio.h>
#include <stdlib.h>
***************
*** 27,37 ****
#include <math.h>
#include <ctype.h>
- #include <errno.h>
#include <float.h>
#include <teem/air.h>
- /* ---- BEGIN non-NrrdIO */
#include <teem/hest.h>
- /* ---- END non-NrrdIO */
#include <teem/biff.h>
--- 30,37 ----
***************
*** 39,42 ****
--- 39,43 ----
#include "nrrdMacros.h"
#include "nrrdEnums.h"
+ /* ---- END non-NrrdIO */
#if defined(_WIN32) && !defined(TEEM_STATIC) && !defined(__CYGWIN__)
***************
*** 632,635 ****
--- 633,637 ----
size_t I, double d);
extern nrrd_export int (*nrrdSprint[NRRD_TYPE_MAX+1])(char *, const void *);
+ /* ---- BEGIN non-NrrdIO */
extern nrrd_export int (*nrrdFprint[NRRD_TYPE_MAX+1])(FILE *, const void *);
extern nrrd_export float (*nrrdFClamp[NRRD_TYPE_MAX+1])(float);
***************
*** 640,643 ****
--- 642,647 ----
extern nrrd_export int (*nrrdValCompare[NRRD_TYPE_MAX+1])(const void *,
const void *);
+ /* ---- END non-NrrdIO */
+
/******** permuting, shuffling, and all flavors of reshaping */
|