--- ray/src/cv/bsdfrep.c	2012/10/20 07:02:00	2.2
+++ ray/src/cv/bsdfrep.c	2012/10/23 05:10:42	2.4
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdfrep.c,v 2.2 2012/10/20 07:02:00 greg Exp $";
+static const char RCSid[] = "$Id: bsdfrep.c,v 2.4 2012/10/23 05:10:42 greg Exp $";
 #endif
 /*
  * Support BSDF representation as radial basis functions.
@@ -14,7 +14,7 @@ static const char RCSid[] = "$Id: bsdfrep.c,v 2.2 2012
 #include "rtio.h"
 #include "resolu.h"
 #include "bsdfrep.h"
-				/* which quadrants are represented */
+				/* coverage/symmetry using INP_QUAD? flags */
 int			inp_coverage = 0;
 				/* all incident angles in-plane so far? */
 int			single_plane_incident = -1;
@@ -281,7 +281,7 @@ get_dsf(int ord)
 	RBFNODE		*rbf;
 
 	for (rbf = dsf_list; rbf != NULL; rbf = rbf->next)
-		if (rbf->ord == ord);
+		if (rbf->ord == ord)
 			return(rbf);
 	return(NULL);
 }
@@ -312,17 +312,17 @@ is_rev_tri(const FVECT v1, const FVECT v2, const FVECT
 int
 get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig)
 {
-	const MIGRATION	*ej, *ej2;
+	const MIGRATION	*ej1, *ej2;
 	RBFNODE		*tv;
 
 	rbfv[0] = rbfv[1] = NULL;
 	if (mig == NULL)
 		return(0);
-	for (ej = mig->rbfv[0]->ejl; ej != NULL;
-				ej = nextedge(mig->rbfv[0],ej)) {
-		if (ej == mig)
+	for (ej1 = mig->rbfv[0]->ejl; ej1 != NULL;
+				ej1 = nextedge(mig->rbfv[0],ej1)) {
+		if (ej1 == mig)
 			continue;
-		tv = opp_rbf(mig->rbfv[0],ej);
+		tv = opp_rbf(mig->rbfv[0],ej1);
 		for (ej2 = tv->ejl; ej2 != NULL; ej2 = nextedge(tv,ej2))
 			if (opp_rbf(tv,ej2) == mig->rbfv[1]) {
 				rbfv[is_rev_tri(mig->rbfv[0]->invec,
@@ -334,6 +334,25 @@ get_triangles(RBFNODE *rbfv[2], const MIGRATION *mig)
 	return((rbfv[0] != NULL) + (rbfv[1] != NULL));
 }
 
+/* Clear our BSDF representation and free memory */
+void
+clear_bsdf_rep(void)
+{
+	while (mig_list != NULL) {
+		MIGRATION	*mig = mig_list;
+		mig_list = mig->next;
+		free(mig);
+	}
+	while (dsf_list != NULL) {
+		RBFNODE		*rbf = dsf_list;
+		dsf_list = rbf->next;
+		free(rbf);
+	}
+	inp_coverage = 0;
+	single_plane_incident = -1;
+	input_orient = output_orient = 0;
+}
+
 /* Write our BSDF mesh interpolant out to the given binary stream */
 void
 save_bsdf_rep(FILE *ofp)
@@ -370,8 +389,8 @@ save_bsdf_rep(FILE *ofp)
 					/* write out as sparse data */
 		n = mtx_nrows(mig) * mtx_ncols(mig);
 		for (i = 0; i < n; i++) {
-			if (zerocnt >= 0xff) {
-				putint(zerocnt, 1, ofp); zerocnt = 0;
+			if (zerocnt == 0xff) {
+				putint(0xff, 1, ofp); zerocnt = 0;
 			}
 			if (mig->mtx[i] != 0) {
 				putint(zerocnt, 1, ofp); zerocnt = 0;
@@ -417,16 +436,8 @@ load_bsdf_rep(FILE *ifp)
 	RBFNODE		rbfh;
 	int		from_ord, to_ord;
 	int		i;
-#ifdef DEBUG
-	if ((dsf_list != NULL) | (mig_list != NULL)) {
-		fprintf(stderr,
-		"%s: attempt to load BSDF interpolant over existing\n",
-				progname);
-		return(0);
-	}
-#endif
-	input_orient = output_orient = 0;
-	single_plane_incident = -1;
+
+	clear_bsdf_rep();
 	if (getheader(ifp, headline, NULL) < 0 || single_plane_incident < 0 |
 			!input_orient | !output_orient) {
 		fprintf(stderr, "%s: missing/bad format for BSDF interpolant\n",
@@ -441,9 +452,8 @@ load_bsdf_rep(FILE *ifp)
 		rbfh.invec[0] = getflt(ifp);
 		rbfh.invec[1] = getflt(ifp);
 		rbfh.invec[2] = getflt(ifp);
+		rbfh.vtotal = getflt(ifp);
 		rbfh.nrbf = getint(4, ifp);
-		if (!new_input_vector(rbfh.invec))
-			return(0);
 		newrbf = (RBFNODE *)malloc(sizeof(RBFNODE) +
 					sizeof(RBFVAL)*(rbfh.nrbf-1));
 		if (newrbf == NULL)
@@ -487,12 +497,10 @@ load_bsdf_rep(FILE *ifp)
 		memset(newmig->mtx, 0, sizeof(float)*n);
 		for (i = 0; ; ) {	/* read sparse data */
 			int	zc = getint(1, ifp) & 0xff;
-			if (zc == 0xff) {
-				i += 0xff;
-				continue;
-			}
 			if ((i += zc) >= n)
 				break;
+			if (zc == 0xff)
+				continue;
 			newmig->mtx[i++] = getflt(ifp);
 		}
 		if (feof(ifp))