--- ray/src/cv/pabopto2bsdf.c	2014/03/21 01:04:42	2.21
+++ ray/src/cv/pabopto2bsdf.c	2014/06/06 00:58:22	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.21 2014/03/21 01:04:42 greg Exp $";
+static const char RCSid[] = "$Id: pabopto2bsdf.c,v 2.25 2014/06/06 00:58:22 greg Exp $";
 #endif
 /*
  * Load measured BSDF data in PAB-Opto format.
@@ -77,7 +77,9 @@ init_pabopto_inp(const int i, const char *fname)
 				inpfile[i].isDSF = 1;
 				continue;
 			}
-			if (!strcasecmp(typ, "BSDF")) {
+			if (!strcasecmp(typ, "BSDF") ||
+					!strcasecmp(typ, "BRDF") ||
+					!strcasecmp(typ, "BTDF")) {
 				inpfile[i].isDSF = 0;
 				continue;
 			}
@@ -129,7 +131,7 @@ add_pabopto_inp(const int i)
 		if (i)			/* process previous incidence */
 			make_rbfrep();
 #ifdef DEBUG
-		fprintf(stderr, "New incident (theta,phi)=(%f,%f)\n",
+		fprintf(stderr, "New incident (theta,phi)=(%.1f,%.1f)\n",
 					inpfile[i].theta, inpfile[i].phi);
 #endif
 		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
@@ -184,7 +186,7 @@ main(int argc, char *argv[])
 	for (i = 0; i < ninpfiles; i++)
 		if (!init_pabopto_inp(i, argv[i+1]))
 			return(1);
-	qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_indir);
+	qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
 						/* compile measurements */
 	for (i = 0; i < ninpfiles; i++)
 		if (!add_pabopto_inp(i))
@@ -236,7 +238,7 @@ main(int argc, char *argv[])
 		if (dsf_grid[i][j].sum.n > 0) {
 			ovec_from_pos(dir, i, j);
 			bsdf = dsf_grid[i][j].sum.v /
-				(dsf_grid[i][j].sum.n*output_orient*dir[2]);
+			   ((double)dsf_grid[i][j].sum.n*output_orient*dir[2]);
 			if (bsdf <= bsdf_min*.6)
 				continue;
 			bsdf = log(bsdf + 1e-5) - min_log;