ViewVC Help

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

root/Development/ray/src/cv/mgflib/parser.c

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.24 by greg, Tue Mar 18 11:17:24 1997 UTC vs.
Revision 1.26 by gregl, Mon Dec 15 09:41:37 1997 UTC

#	Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10
11		#include <stdio.h>
12		#include <math.h>
13	+	#include <stdlib.h>
14		#include <ctype.h>
15		#include <string.h>
16		#include "parser.h"
#	Line 266 | Line 267 | void
267		mg_fgetpos(pos)                 /* get current position in input file */
268		register MG_FPOS        *pos;
269		{
269	–	extern long     ftell();
270	–
270		pos->fid = mg_file->fid;
271		pos->lineno = mg_file->lineno;
272		pos->offset = ftell(mg_file->fp);
#	Line 315 | Line 314 | mg_parse()                     /* parse current input line */
314		{
315		char    abuf[MG_MAXLINE];
316		char    *argv[MG_MAXARGC];
318	–	int     en;
317		register char   *cp, *cp2, **ap;
318		/* copy line, removing escape chars */
319		cp = abuf; cp2 = mg_file->inpline;
#	Line 810 | Line 808 | char   **av;
808		if (rad2 == 0.)
809		return(MG_EILL);
810		} else if (rad2 != 0.) {
811	<	if (rad1 < 0. ^ rad2 < 0.)
811	>	if ((rad1 < 0.) ^ (rad2 < 0.))
812		return(MG_EILL);
813		} else {                        /* swap */
814		C_VERTEX        *cv;

Diff Legend

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