ViewVC Help

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

root/Development/ray/src/common/bsdf.c

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.32 by greg, Thu Jun 23 16:00:37 2011 UTC vs.
Revision 2.34 by greg, Thu Jul 7 15:25:09 2011 UTC

#	Line 250 | Line 250 | SDfreeSpectralDF(SDSpectralDF *df)
250		return;
251		SDfreeCumulativeCache(df);
252		for (n = df->ncomp; n-- > 0; )
253	<	(*df->comp[n].func->freeSC)(df->comp[n].dist);
253	>	if (df->comp[n].dist != NULL)
254	>	(*df->comp[n].func->freeSC)(df->comp[n].dist);
255		free(df);
256		}
257
#	Line 933 | Line 934 | ab_getndx(             /* get index corresponding to the given ve
934		{
935		ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
936		int     li, ndx;
937	<	double  pol, azi, d;
937	>	double  pol, azi;
938
939		if ((v[2] < -1.0) | (v[2] > 1.0))
940		return(-1);
#	Line 1173 | Line 1174 | check_bsdf_data(       /* check that BSDF data is sane */
1174		)
1175		{
1176		double          *omega_iarr, *omega_oarr;
1177	<	double          dom, contrib, hemi_total, full_total;
1177	>	double          dom, hemi_total, full_total;
1178		int             nneg;
1179		FVECT           v;
1180		int             i, o;
#	Line 1323 | Line 1324 | load_BSDF(             /* load BSDF data from file */
1324		error(WARNING, errmsg);
1325		ezxml_free(fl);
1326		return(NULL);
1327	<	}
1328	<	load_angle_basis(ezxml_child(ezxml_child(wtl,
1329	<	"DataDefinition"), "AngleBasis"));
1327	>	}
1328	>	for (wld = ezxml_child(ezxml_child(wtl,
1329	>	"DataDefinition"), "AngleBasis");
1330	>	wld != NULL; wld = wld->next)
1331	>	load_angle_basis(wld);
1332		dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
1333		load_geometry(dp, ezxml_child(wtl, "Material"));
1334		for (wld = ezxml_child(wtl, "WavelengthData");

Diff Legend

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