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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.31 by greg, Sat May 4 00:32:47 2019 UTC vs.
Revision 2.33 by greg, Thu Jun 8 17:39:13 2023 UTC

#	Line 41 \| Line 41 \| *readoct( / read in octree file or stream /*
41		char *ofn[]
42		)
43		{
44	+	time_t oct_t = 0;
45	+	time_t last_it = 0;
46		char sbuf[512];
47		int nf;
48		int i;
#	Line 62 \| Line 64 \| *readoct( / read in octree file or stream /*
64		inpspec);
65		error(SYSTEM, errmsg);
66		}
67	+	oct_t = fddate(fileno(infp));
68		}
69	+	#ifdef getc_unlocked /* avoid stupid semaphores */
70	+	flockfile(infp);
71	+	#endif
72		SET_FILE_BINARY(infp);
73		/* get header */
74		if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
#	Line 87 \| Line 93 \| *readoct( / read in octree file or stream /*
93		readobj(sbuf);
94		if (load & IO_FILES)
95		ofn[nf] = savqstr(sbuf);
96	+	if (oct_t > last_it) {
97	+	time_t t = fdate(sbuf);
98	+	if (t > last_it)
99	+	last_it = t;
100	+	}
101		nf++;
102		}
103		if (load & IO_FILES)
#	Line 111 \| Line 122 \| *readoct( / read in octree file or stream /*
122		if (nobjects != objorig+fnobjects)
123		octerror(USER, "bad object count; octree stale?");
124		/* check for non-surfaces */
125	<	if (nonsurfintree(scene->cutree))
125	>	if (oct_t <= last_it && nonsurfintree(scene->cutree))
126		octerror(USER, "modifier in tree; octree stale?");
127		}
128		}
#	Line 120 \| Line 131 \| *readoct( / read in octree file or stream /*
131		pclose(infp);
132		else if (infp != stdin)
133		fclose(infp);
134	+	#ifdef getc_unlocked
135	+	else
136	+	funlockfile(infp);
137	+	#endif
138		return(nf);
139		}
140

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