ViewVC Help

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

root/Development/ray/src/rt/rc2.c

Comparing ray/src/rt/rc2.c (file contents):
Revision 2.18 by greg, Thu Aug 18 00:52:48 2016 UTC vs.
Revision 2.21 by greg, Fri Sep 16 05:06:07 2016 UTC

#	Line 184 | Line 184 | getostream(const char *ospec, const char *mname, int b
184		sop = (STREAMOUT *)malloc(sizeof(STREAMOUT));
185		if (sop == NULL)
186		error(SYSTEM, "out of memory in getostream");
187	<	sop->outpipe = oname[0] == '!';
187	>	sop->outpipe = (oname[0] == '!');
188		sop->reclen = 0;
189		sop->ofp = NULL;                /* open iff noopen==0 */
190		sop->xr = xres; sop->yr = yres;
#	Line 194 | Line 194 | getostream(const char *ospec, const char *mname, int b
194		errno = EEXIST;         /* file exists */
195		goto openerr;
196		}
197	+	} else if (noopen && outfmt == 'c' &&   /* stream exists to picture? */
198	+	(sop->xr > 0) & (sop->yr > 0)) {
199	+	if (ofl & OF_BIN)
200	+	return(NULL);           /* let caller offset bins */
201	+	sprintf(errmsg, "output '%s' not a valid picture", oname);
202	+	error(WARNING, errmsg);
203		}
204		if (!noopen && sop->ofp == NULL) {      /* open output stream */
205		if (oname[0] == '!')            /* output to command */
#	Line 331 | Line 337 | put_contrib(const DCOLOR cnt, FILE *fout)
337		void
338		mod_output(MODCONT *mp)
339		{
340	<	STREAMOUT       *sop = getostream(mp->outspec, mp->modname, 0, 0);
340	>	STREAMOUT       *sop = getostream(mp->outspec, mp->modname, mp->bin0, 0);
341		int             j;
342
343		put_contrib(mp->cbin[0], sop->ofp);
344		if (mp->nbins > 3 &&    /* minor optimization */
345	<	sop == getostream(mp->outspec, mp->modname, 1, 0)) {
345	>	sop == getostream(mp->outspec, mp->modname, mp->bin0+1, 0)) {
346		for (j = 1; j < mp->nbins; j++)
347		put_contrib(mp->cbin[j], sop->ofp);
348		} else {
349		for (j = 1; j < mp->nbins; j++) {
350	<	sop = getostream(mp->outspec, mp->modname, j, 0);
350	>	sop = getostream(mp->outspec, mp->modname, mp->bin0+j, 0);
351		put_contrib(mp->cbin[j], sop->ofp);
352		}
353		}
#	Line 439 | Line 445 | reload_output()
445		char            *outvfmt;
446		LUENT           *oent;
447		int             xr, yr;
448	<	STREAMOUT       sout;
448	>	STREAMOUT       *sop;
449		DCOLOR          rgbv;
450
451		if (outfmt == 'a')
#	Line 452 | Line 458 | reload_output()
458		error(USER, "cannot reload from stdout");
459		if (mp->outspec[0] == '!')
460		error(USER, "cannot reload from command");
461	<	for (j = 0; ; j++) {            /* load each modifier bin */
462	<	ofl = ofname(oname, mp->outspec, mp->modname, j);
461	>	for (j = 0; j < mp->nbins; j++) { /* load each modifier bin */
462	>	ofl = ofname(oname, mp->outspec, mp->modname, mp->bin0+j);
463		if (ofl < 0)
464		error(USER, "bad output file specification");
465		oent = lu_find(&ofiletab, oname);
466	<	if (oent->data != NULL) {
467	<	sout = *(STREAMOUT *)oent->data;
468	<	} else {
469	<	sout.reclen = 0;
470	<	sout.outpipe = 0;
471	<	sout.xr = xres; sout.yr = yres;
466	<	sout.ofp = NULL;
467	<	}
468	<	if (sout.ofp == NULL) { /* open output as input */
469	<	sout.ofp = fopen(oname, fmode);
470	<	if (sout.ofp == NULL) {
471	<	if (j == mp->nbins)
472	<	break;  /* assume end of modifier */
466	>	if (oent->data == NULL)
467	>	error(INTERNAL, "unallocated stream in reload_output()");
468	>	sop = (STREAMOUT *)oent->data;
469	>	if (sop->ofp == NULL) { /* open output as input */
470	>	sop->ofp = fopen(oname, fmode);
471	>	if (sop->ofp == NULL) {
472		sprintf(errmsg, "missing reload file '%s'",
473		oname);
474		error(WARNING, errmsg);
475		break;
476		}
477		#ifdef getc_unlocked
478	<	flockfile(sout.ofp);
478	>	flockfile(sop->ofp);
479		#endif
480	<	if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) {
480	>	if (header && checkheader(sop->ofp, outvfmt, NULL) != 1) {
481		sprintf(errmsg, "format mismatch for '%s'",
482		oname);
483		error(USER, errmsg);
484		}
485	<	if ((sout.reclen == 1) & (sout.xr > 0) & (sout.yr > 0) &&
486	<	(!fscnresolu(&xr, &yr, sout.ofp) ||
487	<	(xr != sout.xr) |
488	<	(yr != sout.yr))) {
485	>	if ((sop->reclen == 1) & (sop->xr > 0) & (sop->yr > 0) &&
486	>	(!fscnresolu(&xr, &yr, sop->ofp) ||
487	>	(xr != sop->xr) |
488	>	(yr != sop->yr))) {
489		sprintf(errmsg, "resolution mismatch for '%s'",
490		oname);
491		error(USER, errmsg);
492		}
493		}
494		/* read in RGB value */
495	<	if (!get_contrib(rgbv, sout.ofp)) {
495	>	if (!get_contrib(rgbv, sop->ofp)) {
496		if (!j) {
497	<	fclose(sout.ofp);
497	>	fclose(sop->ofp);
498		break;          /* ignore empty file */
499		}
500		if (j < mp->nbins) {
#	Line 504 | Line 503 | reload_output()
503		error(USER, errmsg);
504		}
505		break;
506	<	}
508	<	if (j >= mp->nbins) {           /* check modifier size */
509	<	sprintf(errmsg,
510	<	"mismatched -bn setting for reloading '%s'",
511	<	modname[i]);
512	<	error(USER, errmsg);
513	<	}
514	<
506	>	}
507		copycolor(mp->cbin[j], rgbv);
516	–	if (oent->key == NULL)          /* new file entry */
517	–	oent->key = strcpy((char *)
518	–	malloc(strlen(oname)+1), oname);
519	–	if (oent->data == NULL)
520	–	oent->data = (char *)malloc(sizeof(STREAMOUT));
521	–	*(STREAMOUT *)oent->data = sout;
508		}
509		}
510		lu_doall(&ofiletab, &myclose, NULL);    /* close all files */
#	Line 554 | Line 540 | recover_output()
540		int             ofl;
541		char            oname[1024];
542		LUENT           *oent;
543	<	STREAMOUT       sout;
543	>	STREAMOUT       *sop;
544		off_t           nvals;
545		int             xr, yr;
546
#	Line 583 | Line 569 | recover_output()
569		error(USER, "cannot recover from stdout");
570		if (mp->outspec[0] == '!')
571		error(USER, "cannot recover from command");
572	<	for (j = 0; ; j++) {            /* check each bin's file */
573	<	ofl = ofname(oname, mp->outspec, mp->modname, j);
572	>	for (j = 0; j < mp->nbins; j++) { /* check each bin's file */
573	>	ofl = ofname(oname, mp->outspec, mp->modname, mp->bin0+j);
574		if (ofl < 0)
575		error(USER, "bad output file specification");
576		oent = lu_find(&ofiletab, oname);
577	<	if (oent->data != NULL) {
578	<	sout = *(STREAMOUT *)oent->data;
579	<	} else {
580	<	sout.reclen = 0;
595	<	sout.outpipe = 0;
596	<	sout.xr = xres;
597	<	sout.yr = yres;
598	<	sout.ofp = NULL;
599	<	}
600	<	if (sout.ofp != NULL) { /* already open? */
577	>	if (oent->data == NULL)
578	>	error(INTERNAL, "unallocated stream in recover_output()");
579	>	sop = (STREAMOUT *)oent->data;
580	>	if (sop->ofp != NULL) { /* already open? */
581		if (ofl & OF_BIN)
582		continue;
583		break;
584		}
585		/* open output */
586	<	sout.ofp = fopen(oname, "rb+");
587	<	if (sout.ofp == NULL) {
608	<	if (j == mp->nbins)
609	<	break;  /* assume end of modifier */
586	>	sop->ofp = fopen(oname, "rb+");
587	>	if (sop->ofp == NULL) {
588		sprintf(errmsg, "missing recover file '%s'",
589		oname);
590		error(WARNING, errmsg);
591	+	lastout = 0;
592		break;
593		}
594	<	nvals = lseek(fileno(sout.ofp), 0, SEEK_END);
594	>	nvals = lseek(fileno(sop->ofp), 0, SEEK_END);
595		if (nvals <= 0) {
596		lastout = 0;    /* empty output, quit here */
597	<	fclose(sout.ofp);
597	>	fclose(sop->ofp);
598		break;
599		}
600	<	if (!sout.reclen) {
622	<	if (!(ofl & OF_BIN)) {
623	<	sprintf(errmsg,
624	<	"need -bn to recover file '%s'",
625	<	oname);
626	<	error(USER, errmsg);
627	<	}
628	<	recsiz = outvsiz;
629	<	} else
630	<	recsiz = outvsiz * sout.reclen;
600	>	recsiz = outvsiz * sop->reclen;
601
602	<	lseek(fileno(sout.ofp), 0, SEEK_SET);
603	<	if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) {
602	>	lseek(fileno(sop->ofp), 0, SEEK_SET);
603	>	if (header && checkheader(sop->ofp, outvfmt, NULL) != 1) {
604		sprintf(errmsg, "format mismatch for '%s'",
605		oname);
606		error(USER, errmsg);
607		}
608	<	if ((sout.reclen == 1) & (sout.xr > 0) & (sout.yr > 0) &&
609	<	(!fscnresolu(&xr, &yr, sout.ofp) ||
610	<	(xr != sout.xr) |
611	<	(yr != sout.yr))) {
608	>	if ((sop->reclen == 1) & (sop->xr > 0) & (sop->yr > 0) &&
609	>	(!fscnresolu(&xr, &yr, sop->ofp) ||
610	>	(xr != sop->xr) |
611	>	(yr != sop->yr))) {
612		sprintf(errmsg, "resolution mismatch for '%s'",
613		oname);
614		error(USER, errmsg);
615		}
616	<	nvals = (nvals - (off_t)ftell(sout.ofp)) / recsiz;
616	>	nvals = (nvals - (off_t)ftell(sop->ofp)) / recsiz;
617		if ((lastout < 0) | (nvals < lastout))
618		lastout = nvals;
649	–	if (oent->key == NULL)  /* new entry */
650	–	oent->key = strcpy((char *)
651	–	malloc(strlen(oname)+1), oname);
652	–	if (oent->data == NULL)
653	–	oent->data = (char *)malloc(sizeof(STREAMOUT));
654	–	*(STREAMOUT *)oent->data = sout;
619		if (!(ofl & OF_BIN))
620		break;          /* no bin separation */
621		}
622		if (!lastout) {                 /* empty output */
623		error(WARNING, "no previous data to recover");
624	<	lu_done(&ofiletab);     /* reclose all outputs */
624	>	/* reclose all outputs */
625	>	lu_doall(&ofiletab, &myclose, NULL);
626		return;
662	–	}
663	–	if (j > mp->nbins) {            /* check modifier size */
664	–	sprintf(errmsg,
665	–	"mismatched -bn setting for recovering '%s'",
666	–	modname[i]);
667	–	error(USER, errmsg);
627		}
628		}
629		if (lastout < 0) {

Diff Legend

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