--- ray/src/common/bsdf.c	2011/04/25 15:48:05	2.26
+++ ray/src/common/bsdf.c	2011/06/28 21:11:04	2.33
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf.c,v 2.26 2011/04/25 15:48:05 greg Exp $";
+static const char RCSid[] = "$Id: bsdf.c,v 2.33 2011/06/28 21:11:04 greg Exp $";
 #endif
 /*
  *  bsdf.c
@@ -10,9 +10,12 @@ static const char RCSid[] = "$Id: bsdf.c,v 2.26 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);
 	
@@ -813,7 +814,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 */
 
@@ -933,7 +933,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);
@@ -1173,7 +1173,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;