ViewVC Help

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

root/Development/ray/src/cv/bsdf2rad.c

Comparing ray/src/cv/bsdf2rad.c (file contents):
Revision 2.26 by greg, Wed Apr 12 03:35:01 2017 UTC vs.
Revision 2.27 by greg, Wed Apr 12 04:15:08 2017 UTC

#	Line 749 | Line 749 | main(int argc, char *argv[])
749		strcpy(bsdf_manuf, myBSDF.makr);
750		put_matBSDF(argv[1]);
751		} else {
752	<	FILE    *fp;
752	>	FILE    *fp[4];
753	>	if (argc > 5) {
754	>	fprintf(stderr, "%s: too many input files\n", progname);
755	>	return(1);
756	>	}
757		for (n = 1; n < argc; n++) {
758	<	fp = fopen(argv[n], "rb");
759	<	if (fp == NULL) {
758	>	fp[n-1] = fopen(argv[n], "rb");
759	>	if (fp[n-1] == NULL) {
760		fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n",
761		progname, argv[n]);
762		return(1);
763		}
764	<	if (getheader(fp, rbf_headline, NULL) < 0) {
764	>	if (getheader(fp[n-1], rbf_headline, NULL) < 0) {
765		fprintf(stderr, "%s: bad BSDF interpolant '%s'\n",
766		progname, argv[n]);
767		return(1);
768		}
765	–	fclose(fp);
769		}
770		set_minlog();
771		for (n = 1; n < argc; n++) {
772	<	fp = fopen(argv[n], "rb");
773	<	if (!load_bsdf_rep(fp))
772	>	if (fseek(fp[n-1], 0L, SEEK_SET) < 0) {
773	>	fprintf(stderr, "%s: cannot seek on '%s'\n",
774	>	progname, argv[n]);
775		return(1);
776	<	fclose(fp);
776	>	}
777	>	if (!load_bsdf_rep(fp[n-1]))
778	>	return(1);
779	>	fclose(fp[n-1]);
780		if (!build_wRBF())
781		return(1);
782		}

Diff Legend

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