[ViewVC] Diff of: radiance/ray/src/hd/rhcopy.c

Comparing ray/src/hd/rhcopy.c (file contents):
Revision 3.25 by greg, Sun Sep 26 15:39:10 2010 UTC vs.
Revision 3.28 by greg, Wed May 3 18:05:15 2017 UTC

#	Line 134 \| Line 134 \| *openholo( / open existing holodeck file for i/o /*
134		FILE *fp;
135		int fd;
136		int hflags = 0;
137	<	int32 nextloc;
137	>	off_t nextloc;
138		int n;
139		/* open holodeck file */
140		if ((fp = fopen(fname, append ? "r+" : "r")) == NULL) {
#	Line 152 \| Line 152 \| *openholo( / open existing holodeck file for i/o /*
152		nextloc = ftell(fp); /* get stdio position */
153		fclose(fp); /* done with stdio */
154		for (n = 0; nextloc > 0L; n++) { /* initialize each section */
155	<	lseek(fd, (off_t)nextloc, SEEK_SET);
155	>	lseek(fd, nextloc, SEEK_SET);
156		read(fd, (char *)&nextloc, sizeof(nextloc));
157		hdinit(fd, NULL)->priv = hflags&H_OBST ? &obstr :
158		hflags&H_OBSF ? &unobstr : (char *)NULL;
#	Line 176 \| Line 176 \| *addray( / add a ray to our output holodeck /*
176		int sn, bi, n;
177		register HOLO *hp;
178		GCOORD gc[2];
179	<	BYTE rr[2][2];
179	>	uby8 rr[2][2];
180		BEAM *bp;
181		double d0, d1;
182		unsigned dc;
#	Line 359 \| Line 359 \| *addpicz( / add a picture + depth-buffer /*
359		error(USER, errmsg);
360		}
361		if (phd.altprims) {
362	<	sprintf(errmsg, "ignoring primary values in picture \"%s\"",
362	>	sprintf(errmsg, "ignoring color primaries in picture \"%s\"",
363		pcf);
364		error(WARNING, errmsg);
365		}

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