ViewVC Help

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

root/Development/ray/src/hd/rholo3.c

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.39 by greg, Mon Jul 7 17:21:51 2003 UTC vs.
Revision 3.40 by schorsch, Mon Jul 21 22:30:18 2003 UTC

#	Line 310 | Line 310 | FILE   *fp;
310		char    *err;
311		BEAMLIST        blist;
312
313	<	copystruct(&curview, &stdview);
313	>	curview = stdview;
314		while (nextview(&curview, fp) != EOF) {
315		if ((err = setview(&curview)) != NULL) {
316		error(WARNING, err);
#	Line 357 | Line 357 | int    n1, n2;
357		else if (!n2) cmp = -1;
358		else cmp = beamcmp(cl1, cl2);
359		if (cmp > 0) {
360	<	copystruct(cdest, cl2);
360	>	*cdest = *cl2;
361		cl2++; n2--;
362		} else {
363	<	copystruct(cdest, cl1);
363	>	*cdest = *cl1;
364		cl1++; n1--;
365		}
366		cdest++;

Diff Legend

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