--- ray/src/cv/bsdfquery.c	2013/11/22 00:00:27	2.2
+++ ray/src/cv/bsdfquery.c	2016/01/20 19:43:34	2.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdfquery.c,v 2.2 2013/11/22 00:00:27 greg Exp $";
+static const char RCSid[] = "$Id: bsdfquery.c,v 2.5 2016/01/20 19:43:34 greg Exp $";
 #endif
 /*
  *  Query values from the given BSDF (scattering interpolant or XML repres.)
@@ -27,11 +27,9 @@ readIOdir(FVECT idir, FVECT odir, FILE *fp, int fmt)
 
 	switch (fmt) {
 	case 'a':
-		if (fscanf(fp, "%lf %lf %lf %lf %lf %lf",
-			dvec, dvec+1, dvec+2, dvec+3, dvec+4, dvec+5) != 6)
+		if (fscanf(fp, FVFORMAT, &idir[0], &idir[1], &idir[2]) != 3 ||
+				fscanf(fp, FVFORMAT, &odir[0], &odir[1], &odir[2]) != 3)
 			return(0);
-		VCOPY(idir, dvec);
-		VCOPY(odir, dvec+3);
 		break;
 	case 'd':
 		if (fread(dvec, sizeof(double), 6, fp) != 6)
@@ -127,7 +125,7 @@ main(int argc, char *argv[])
 						progname);
 				return(1);
 			}
-			bsdf = eval_rbfrep(rbf, odir)/(output_orient*odir[2]);
+			bsdf = eval_rbfrep(rbf, odir);
 		}
 		switch (outfmt) {		/* write to stdout */
 		case 'a':