--- ray/src/px/ra_bn.c	1989/02/02 10:49:32	1.1
+++ ray/src/px/ra_bn.c	1990/03/12 15:14:37	1.4
@@ -66,9 +66,9 @@ char  *argv[];
 			quiterr(errmsg);
 		}
 					/* put header */
-		printargs(argc, argv, rafp);
+		printargs(i, argv, rafp);
 		putc('\n', rafp);
-		fprintf(rafp, "-Y %d +X %d\n", ymax, xmax);
+		fputresolu(YMAJOR|YDECR, xmax, ymax, rafp);
 					/* convert file */
 		bn2ra();
 	} else {
@@ -83,7 +83,7 @@ char  *argv[];
 		}
 					/* get header */
 		getheader(rafp, NULL);
-		if (fscanf(rafp, "-Y %d +X %d\n", &ymax, &xmax) != 2)
+		if (fgetresolu(&xmax, &ymax, rafp) != (YMAJOR|YDECR))
 			quiterr("bad RADIANCE format");
 		if (openbarney(argv[i+1], "w") < 0) {
 			sprintf(errmsg, "cannot open output \"%s\"", argv[i+1]);
@@ -167,25 +167,25 @@ ra2bn()					/* convert radiance to barneyscan */
 {
 	unsigned char	gmap[1024];
 	register int	i,k,c;
-	register COLOR	*inline;
+	register COLOR	*inl;
 	int	j;
 
-	if ((inline = (COLOR *)malloc(xmax*sizeof(COLOR))) == NULL)
+	if ((inl = (COLOR *)malloc(xmax*sizeof(COLOR))) == NULL)
 		quiterr("out of memory");
 	for (i = 0; i < 1024; i++)
 		gmap[i] = 256.*pow((i+.5)/1024., 1./gamma);
 	for (j = 0; j < ymax; j++) {
-		if (freadscan(inline, xmax, rafp) < 0)
+		if (freadscan(inl, xmax, rafp) < 0)
 			quiterr("error reading RADIANCE file");
 		for (i = 0; i < xmax; i++)
 			for (k = 0; k < 3; k++) {
-				c = 1024.*colval(inline[i],k);
+				c = 1024.*colval(inl[i],k);
 				if (c >= 1024)
 					c = 1023;
 				putc(gmap[c], bnfp[k]);
 			}
 	}
-	free((char *)inline);
+	free((char *)inl);
 }