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 1.14 by greg, Wed Oct 23 11:53:38 1991 UTC vs.
Revision 1.15 by greg, Thu Oct 24 10:13:20 1991 UTC

#	Line 43 | Line 43 | char  *ofn[];
43		int  nf;
44		OBJECT  fnobjects;
45		register int  i;
46	+	long  m;
47
48		if (fname == NULL) {
49		infn = "standard input";
#	Line 83 | Line 84 | char  *ofn[];
84		if (load & IO_FILES)
85		ofn[nf] = NULL;
86		/* get number of objects */
87	<	fnobjects = getint(objsize);
87	>	fnobjects = m = getint(objsize);
88	>	if (fnobjects != m)
89	>	octerror(USER, "too many objects");
90
91		if (load & IO_TREE) {
92		/* get the octree */
#	Line 135 | Line 138 | getfullnode()                  /* get a set, return fullnode */
138		register int  i;
139		register long  m;
140
141	<	m = getint(objsize);
139	<	if (m > MAXSET)
141	>	if ((set[0] = getint(objsize)) > MAXSET)
142		octerror(USER, "bad set in getfullnode");
141	–	set[0] = m;
143		for (i = 1; i <= set[0]; i++) {
144		m = getint(objsize) + objorig;
145	<	if ((OBJECT)m != m)
145	>	if ((set[i] = m) != m)
146		octerror(USER, "too many objects");
146	–	set[i] = m;
147		}
148		return(fullnode(set));
149		}
#	Line 252 | Line 252 | getobj()                               /* get next object */
252		objp->oargs.iarg = NULL;
253		#endif
254		if (objp->oargs.nfargs = getint(2)) {
255	<	objp->oargs.farg = (double *)bmalloc
256	<	(objp->oargs.nfargs*sizeof(double));
255	>	objp->oargs.farg = (FLOAT *)bmalloc
256	>	(objp->oargs.nfargs*sizeof(FLOAT));
257		if (objp->oargs.farg == NULL)
258		goto memerr;
259		for (i = 0; i < objp->oargs.nfargs; i++)

Diff Legend

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