--- ray/src/common/bsdf.c	2011/04/24 20:16:52	2.25
+++ ray/src/common/bsdf.c	2011/07/07 15:25:09	2.34
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf.c,v 2.25 2011/04/24 20:16:52 greg Exp $";
+static const char RCSid[] = "$Id: bsdf.c,v 2.34 2011/07/07 15:25:09 greg Exp $";
 #endif
 /*
  *  bsdf.c
@@ -10,9 +10,12 @@ static const char RCSid[] = "$Id: bsdf.c,v 2.25 2011/0
  *
  */
 
+#define	_USE_MATH_DEFINES
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
+#include <ctype.h>
 #include "ezxml.h"
 #include "hilbert.h"
 #include "bsdf.h"
@@ -106,6 +109,10 @@ SDloadGeometry(SDData *sd, ezxml_t wdb)
 	if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
 			(mgfstr = ezxml_txt(geom)) == NULL)
 		return SDEnone;
+	while (isspace(*mgfstr))
+		++mgfstr;
+	if (!*mgfstr)
+		return SDEnone;
 	if ((fmt = ezxml_attr(geom, "format")) != NULL &&
 			strcasecmp(fmt, "MGF")) {
 		sprintf(SDerrorDetail,
@@ -169,15 +176,9 @@ SDloadFile(SDData *sd, const char *fname)
 				/* try loading variable resolution data */
 	lastErr = SDloadTre(sd, wtl);
 				/* check our result */
-	switch (lastErr) {
-	case SDEformat:
-	case SDEdata:
-	case SDEsupport:	/* possibly we just tried the wrong format */
+	if (lastErr == SDEsupport)	/* try matrix BSDF if not tree data */
 		lastErr = SDloadMtx(sd, wtl);
-		break;
-	default:		/* variable res. OK else serious error */
-		break;
-	}
+		
 				/* done with XML file */
 	ezxml_free(fl);
 	
@@ -249,7 +250,8 @@ SDfreeSpectralDF(SDSpectralDF *df)
 		return;
 	SDfreeCumulativeCache(df);
 	for (n = df->ncomp; n-- > 0; )
-		(*df->comp[n].func->freeSC)(df->comp[n].dist);
+		if (df->comp[n].dist != NULL)
+			(*df->comp[n].func->freeSC)(df->comp[n].dist);
 	free(df);
 }
 
@@ -496,7 +498,7 @@ SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
 	SDError		ec;
 	int		i;
 					/* check arguments */
-	if ((projSA == NULL) | (v1 == NULL))
+	if ((projSA == NULL) | (v1 == NULL) | (sd == NULL))
 		return SDEargument;
 					/* initialize extrema */
 	switch (qflags) {
@@ -516,11 +518,12 @@ SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
 		rdf = sd->rf;
 	else
 		rdf = sd->rb;
-	tdf = NULL;			/* transmitted component? */
-	if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) {
-		rdf = NULL;
-		tdf = sd->tf;
-	}
+	tdf = sd->tf;
+	if (v2 != NULL)			/* bidirectional? */
+		if (v1[2] > 0 ^ v2[2] > 0)
+			rdf = NULL;
+		else
+			tdf = NULL;
 	ec = SDEdata;			/* run through components */
 	for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
 		ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,
@@ -812,7 +815,6 @@ SDmapDir(FVECT resVec, RREAL vMtx[3][3], const FVECT i
 
 #include "standard.h"
 #include "paths.h"
-#include <ctype.h>
 
 #define MAXLATS		46		/* maximum number of latitudes */
 
@@ -932,7 +934,7 @@ ab_getndx(		/* get index corresponding to the given ve
 {
 	ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
 	int	li, ndx;
-	double	pol, azi, d;
+	double	pol, azi;
 
 	if ((v[2] < -1.0) | (v[2] > 1.0))
 		return(-1);
@@ -1172,7 +1174,7 @@ check_bsdf_data(	/* check that BSDF data is sane */
 )
 {
 	double		*omega_iarr, *omega_oarr;
-	double		dom, contrib, hemi_total, full_total;
+	double		dom, hemi_total, full_total;
 	int		nneg;
 	FVECT		v;
 	int		i, o;
@@ -1322,9 +1324,11 @@ load_BSDF(		/* load BSDF data from file */
 		error(WARNING, errmsg);
 		ezxml_free(fl);
 		return(NULL);
-	}		
-	load_angle_basis(ezxml_child(ezxml_child(wtl,
-				"DataDefinition"), "AngleBasis"));
+	}
+	for (wld = ezxml_child(ezxml_child(wtl,
+				"DataDefinition"), "AngleBasis");
+			wld != NULL; wld = wld->next)
+		load_angle_basis(wld);
 	dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
 	load_geometry(dp, ezxml_child(wtl, "Material"));
 	for (wld = ezxml_child(wtl, "WavelengthData");