--- ray/src/util/rfluxmtx.c	2015/03/27 18:58:06	2.26
+++ ray/src/util/rfluxmtx.c	2015/05/21 05:54:54	2.29
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rfluxmtx.c,v 2.26 2015/03/27 18:58:06 greg Exp $";
+static const char RCSid[] = "$Id: rfluxmtx.c,v 2.29 2015/05/21 05:54:54 greg Exp $";
 #endif
 /*
  * Calculate flux transfer matrix or matrices using rcontrib
@@ -530,7 +530,7 @@ make_axes(FVECT uva[2], const FVECT nrm)
 {
 	int	i;
 
-	if (!getperpendicular(uva[0], nrm)) {
+	if (!getperpendicular(uva[0], nrm, 1)) {
 		fputs(progname, stderr);
 		fputs(": bad surface normal in make_axes!\n", stderr);
 		exit(1);
@@ -849,7 +849,7 @@ sample_klems(PARAMS *p, int b, FILE *fp)
 
 	while (n--) {			/* stratified sampling */
 		SDmultiSamp(samp2, 2, (n+frandom())/sampcnt);
-		if (!fi_getvec(duvw, b+samp2[1], kbasis[bi]))
+		if (!fo_getvec(duvw, b+samp2[1], kbasis[bi]))
 			return(0);
 		for (i = 3; i--; )
 			orig_dir[1][i] = -duvw[0]*p->udir[i] -
@@ -1292,7 +1292,12 @@ main(int argc, char *argv[])
 			if (argv[a][2] != 'v') na = 2;
 			break;
 		case 'a':		/* special case */
-			na = (argv[a][2] == 'v') ? 4 : 2;
+			if (argv[a][2] == 'p') {
+				na = 2;	/* photon map [+ bandwidth(s)] */
+				if (a < argc-3 && atoi(argv[a+1]) > 0)
+					na += 1 + (a < argc-4 && atoi(argv[a+2]) > 0);
+			} else
+				na = (argv[a][2] == 'v') ? 4 : 2;
 			break;
 		case 'm':		/* special case */
 			if (!argv[a][2]) goto userr;