ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/readoct.c

Comparing ray/src/common/readoct.c (file contents):
Revision 2.5 by greg, Thu Aug 6 09:02:38 1992 UTC vs.
Revision 2.11 by greg, Mon Aug 29 14:20:37 1994 UTC

#	Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21		static double  ogetflt();
22		static long  ogetint();
23		static char  *ogetstr();
24	<	static int  getobj(), octerror();
24	>	static int  getobj(), octerror(), skiptree();
25		static OCTREE  getfullnode(), gettree();
26
27		static char  *infn;                     /* input file name */
#	Line 38 | Line 38 | int  load;
38		CUBE  *scene;
39		char  *ofn[];
40		{
41	–	extern int  fputs();
41		char  sbuf[512];
42		int  nf;
43	<	OBJECT  fnobjects;
43	>	OBJECT  fnobjects;
44		register int  i;
45		long  m;
46
#	Line 56 | Line 55 | char  *ofn[];
55		error(SYSTEM, errmsg);
56		}
57		}
58	+	#ifdef MSDOS
59	+	setmode(fileno(infp), O_BINARY);
60	+	#endif
61		/* get header */
62	<	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
62	>	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
63		octerror(USER, "not an octree");
64		/* check format */
65		if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
#	Line 130 | Line 132 | char  *s;
132		static OCTREE
133		getfullnode()                   /* get a set, return fullnode */
134		{
135	<	OBJECT  set[MAXSET+1];
135	>	OBJECT  set[MAXSET+1];
136		register int  i;
137		register long  m;
138
#	Line 163 | Line 165 | static double
165		ogetflt()                       /* get a floating point number */
166		{
167		extern double  getflt();
168	<	double  r;
168	>	double  r;
169
170		r = getflt(infp);
171		if (feof(infp))
#	Line 175 | Line 177 | ogetflt()                      /* get a floating point number */
177		static OCTREE
178		gettree()                       /* get a pre-ordered octree */
179		{
180	<	register OCTREE  ot;
180	>	register OCTREE  ot;
181		register int  i;
182
183		switch (getc(infp)) {
#	Line 206 | Line 208 | skiptree()                             /* skip octree on input */
208		case OT_EMPTY:
209		return;
210		case OT_FULL:
211	<	for (i = ogetint(objsize); i-- > 0; )
212	<	ogetint(objsize);
211	>	for (i = ogetint(objsize)*objsize; i-- > 0; )
212	>	if (getc(infp) == EOF)
213	>	octerror(USER, "truncated octree");
214		return;
215		case OT_TREE:
216		for (i = 0; i < 8; i++)
#	Line 228 | Line 231 | getobj()                               /* get next object */
231		int  obj;
232		register int  i;
233		register long  m;
234	<	register OBJREC  *objp;
234	>	register OBJREC  *objp;
235
236		i = ogetint(1);
237		if (i == -1)
#	Line 254 | Line 257 | getobj()                               /* get next object */
257		objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
258		} else
259		objp->oargs.sarg = NULL;
260	<	#ifdef  IARGS
260	>	#ifdef  IARGS
261		if (objp->oargs.niargs = ogetint(2)) {
262		objp->oargs.iarg = (long *)bmalloc
263		(objp->oargs.niargs*sizeof(long));
#	Line 276 | Line 279 | getobj()                               /* get next object */
279		objp->oargs.farg = NULL;
280		/* initialize */
281		objp->os = NULL;
279	–	objp->lastrno = -1;
282		/* insert */
283		insertobject(obj);
284		return(obj);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)