[ViewVC] Diff of: radiance/ray/src/common/readoct.c

Comparing ray/src/common/readoct.c (file contents):
Revision 2.19 by greg, Wed Jul 16 01:32:53 2003 UTC vs.
Revision 2.22 by greg, Fri Aug 29 16:46:51 2003 UTC

#	Line 17 \| Line 17 \| static const char RCSid[] = "$Id$";
17		#include "otypes.h"
18		#include "resolu.h"
19
20	<	static double ogetflt();
21	<	static long ogetint();
22	<	static char *ogetstr();
23	<	static int nonsurfinset();
20	>	static double ogetflt(void);
21	>	static long ogetint(int);
22	>	static char ogetstr(char );
23	>	static int nonsurfinset(OBJECT *);
24		static void octerror(int etyp, char *msg);
25		static void skiptree(void);
26	<	static OCTREE getfullnode(), gettree();
26	>	static OCTREE getfullnode(void), gettree(void);
27
28		static char infn; / input file specification */
29		static FILE infp; / input file stream */
#	Line 99 \| Line 99 \| *char ofn[];**
99		else if (load & IO_SCENE && nf == 0)
100		skiptree();
101
102	<	if (load & IO_SCENE) /* get the scene */
102	>	if (load & IO_SCENE) { /* get the scene */
103		if (nf == 0) {
104		/* load binary scene data */
105		readscene(infp, objsize);
#	Line 112 \| Line 112 \| *char ofn[];**
112		if (dosets(nonsurfinset))
113		octerror(USER, "modifier in tree; octree stale?");
114		}
115	+	}
116		/* close the input */
117		if (infn[0] == '!')
118		pclose(infp);
#	Line 200 \| Line 201 \| *gettree() / get a pre-ordered octree /*
201		default:
202		octerror(USER, "damaged octree");
203		}
204	<	return NULL; /* pro forma return */
204	>	return EMPTY; /* pro forma return */
205		}
206
207

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines