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

Comparing ray/src/common/sceneio.c (file contents):
Revision 2.4 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 2.5 by greg, Thu Sep 22 02:15:56 2011 UTC

#	Line 18 \| Line 18 \| *static short otypmap[NUMOTYPE+32]; / object type map**
18
19
20		static int
21	<	getobj(fp, objsiz) /* get next object */
22	<	FILE *fp;
23	<	int objsiz;
21	>	getobj( /* get next object */
22	>	FILE *fp,
23	>	int objsiz
24	>	)
25		{
26		char sbuf[MAXSTR];
27		int obj;
28	<	register int i;
29	<	register long m;
30	<	register OBJREC *objp;
28	>	int i;
29	>	long m;
30	>	OBJREC *objp;
31
32		i = getint(1, fp);
33		if (i == -1)
#	Line 86 \| Line 87 \| memerr:
87
88
89		void
90	<	readscene(fp, objsiz) /* read binary scene description */
91	<	FILE *fp;
92	<	int objsiz;
90	>	readscene( /* read binary scene description */
91	>	FILE *fp,
92	>	int objsiz
93	>	)
94		{
95		char sbuf[32];
96		int i;
#	Line 108 \| Line 110 \| int objsiz;
110
111
112		static void
113	<	putobj(o, fp) /* write out object */
114	<	FILE *fp;
115	<	register OBJREC *o;
113	>	putobj( /* write out object */
114	>	OBJREC *o,
115	>	FILE *fp
116	>	)
117		{
118	<	register int i;
118	>	int i;
119
120		if (o == NULL) { /* terminator */
121		putint(-1L, 1, fp);
#	Line 136 \| Line 139 \| *register OBJREC o;**
139
140
141		void
142	<	writescene(firstobj, nobjs, fp) /* write binary scene description */
143	<	int firstobj, nobjs;
144	<	FILE *fp;
142	>	writescene( /* write binary scene description */
143	>	int firstobj,
144	>	int nobjs,
145	>	FILE *fp
146	>	)
147		{
148		int i;
149		/* write out type list */

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