ViewVC Help

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

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

Comparing ray/src/cv/bsdf2klems.c (file contents):
Revision 2.21 by greg, Thu Feb 4 00:45:47 2016 UTC vs.
Revision 2.25 by greg, Fri May 4 23:56:49 2018 UTC

#	Line 41 | Line 41 | static int             do_prog = 79;
41		static char             *wrapBSDF[MAXCARG] = {"wrapBSDF", "-W", "-UU"};
42		static int              wbsdfac = 3;
43
44	<	/* Add argument to wrapBSDF, allocating space if isstatic */
44	>	/* Add argument to wrapBSDF, allocating space if !isstatic */
45		static void
46		add_wbsdf(const char *arg, int isstatic)
47		{
#	Line 202 | Line 202 | eval_bsdf(const char *fname)
202		goto err;
203		sum += sdv.cieY;
204		if (rbf_colorimetry == RBCtristimulus) {
205	–	c_ccvt(&sdv.spec, C_CSXY);
205		xsum += sdv.cieY * sdv.spec.cx;
206		ysum += sdv.cieY * sdv.spec.cy;
207		}
#	Line 252 | Line 251 | eval_bsdf(const char *fname)
251		goto err;
252		sum += sdv.cieY;
253		if (rbf_colorimetry == RBCtristimulus) {
255	–	c_ccvt(&sdv.spec, C_CSXY);
254		xsum += sdv.cieY * sdv.spec.cx;
255		ysum += sdv.cieY * sdv.spec.cy;
256		}
#	Line 301 | Line 299 | eval_bsdf(const char *fname)
299		goto err;
300		sum += sdv.cieY;
301		if (rbf_colorimetry == RBCtristimulus) {
304	–	c_ccvt(&sdv.spec, C_CSXY);
302		xsum += sdv.cieY * sdv.spec.cx;
303		ysum += sdv.cieY * sdv.spec.cy;
304		}
#	Line 351 | Line 348 | eval_bsdf(const char *fname)
348		goto err;
349		sum += sdv.cieY;
350		if (rbf_colorimetry == RBCtristimulus) {
354	–	c_ccvt(&sdv.spec, C_CSXY);
351		xsum += sdv.cieY * sdv.spec.cx;
352		ysum += sdv.cieY * sdv.spec.cy;
353		}
#	Line 470 | Line 466 | eval_rbf(void)
466
467		eval_rbfcol(&sdv, rbf, vout);
468		sum += sdv.cieY;
469	<	if (XZarr != NULL) {
474	<	c_ccvt(&sdv.spec, C_CSXY);
469	>	if (rbf_colorimetry == RBCtristimulus) {
470		xsum += sdv.cieY * sdv.spec.cx;
471		ysum += sdv.cieY * sdv.spec.cy;
472		}
473		}
474		n = j*abp->nangles + i;
475		bsdfarr[n] = sum / npsamps;
476	<	if (XZarr != NULL) {
476	>	if (rbf_colorimetry == RBCtristimulus) {
477		XZarr[n][0] = xsum*sum/(npsamps*ysum);
478		XZarr[n][1] = (sum - xsum - ysum)*sum/(npsamps*ysum);
479		}
#	Line 520 | Line 515 | eval_rbf(void)
515		}
516		}
517
518	<	#ifdef _WIN32
518	>	#if defined(_WIN32) || defined(_WIN64)
519		/* Execute wrapBSDF command (may never return) */
520		static int
521		wrap_up(void)
#	Line 607 | Line 602 | main(int argc, char *argv[])
602		add_wbsdf("-f", 1);
603		add_wbsdf(argv[i], 1);
604		} else {
605	<	fcompile(argv[i]);
605	>	char    *fpath = getpath(argv[i],
606	>	getrlibpath(), 0);
607	>	if (fpath == NULL) {
608	>	fprintf(stderr,
609	>	"%s: cannot find file '%s'\n",
610	>	argv[0], argv[i]);
611	>	return(1);
612	>	}
613	>	fcompile(fpath);
614		single_plane_incident = 0;
615		}
616		} else

Diff Legend

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