ViewVC Help

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

root/Development/ray/src/util/rtcontrib.c

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.46 by greg, Sat Nov 17 06:21:28 2007 UTC vs.
Revision 1.47 by greg, Sat Nov 17 15:57:28 2007 UTC

#	Line 813 | Line 813 | getostream(const char *ospec, const char *mname, int b
813		*cp = '\0';
814		printheader(sop->ofp, info);
815		}
816	+	if (!accumulate) {              /* global res. for -c- */
817	+	sop->xr = xres; sop->yr = yres;
818	+	}
819		printresolu(sop->ofp, sop->xr, sop->yr);
820		/* play catch-up */
821		for (i = accumulate ? 0 : lastdone; i--; ) {
#	Line 1283 | Line 1286 | reload_output(void)
1286		}
1287		if ((sout.xr > 0) & (sout.yr > 0) &&
1288		(!fscnresolu(&xr, &yr, sout.ofp) ||
1289	<	xr != sout.xr ||
1290	<	yr != sout.yr)) {
1289	>	(xr != sout.xr) |
1290	>	(yr != sout.yr))) {
1291		sprintf(errmsg, "resolution mismatch for '%s'",
1292		oname);
1293		error(USER, errmsg);
#	Line 1300 | Line 1303 | reload_output(void)
1303		if (!get_contrib(rgbv, sout.ofp)) {
1304		if (!j)
1305		break;          /* ignore empty file */
1306	<	if (j && j < mp->nbins) {
1306	>	if (j < mp->nbins) {
1307		sprintf(errmsg, "missing data in '%s'",
1308		oname);
1309		error(USER, errmsg);
#	Line 1428 | Line 1431 | recover_output(FILE *fin)
1431		}
1432		if ((xres > 0) & (yres > 0) &&
1433		(!fscnresolu(&xr, &yr, sout.ofp) ||
1434	<	xr != xres ||
1435	<	yr != yres)) {
1434	>	(xr != xres) |
1435	>	(yr != yres))) {
1436		sprintf(errmsg, "resolution mismatch for '%s'",
1437		oname);
1438		error(USER, errmsg);

Diff Legend

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