--- ray/src/px/ra_ppm.c	1992/09/21 12:14:55	2.3
+++ ray/src/px/ra_ppm.c	1993/11/18 09:55:12	2.6
@@ -14,13 +14,14 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  <fcntl.h>
 #endif
 
+#include  <math.h>
+
 #include  <ctype.h>
 
 #include  "color.h"
 
 #include  "resolu.h"
 
-extern double  pow();
 
 extern char  *malloc();
 
@@ -40,7 +41,7 @@ int  argc;
 char  *argv[];
 {
 	char  inpbuf[2];
-	double	gamma = 2.2;
+	double	gamcor = 2.2;
 	int  binflag = 1;
 	int  reverse = 0;
 	int  ptype;
@@ -52,7 +53,7 @@ char  *argv[];
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
 			case 'g':
-				gamma = atof(argv[++i]);
+				gamcor = atof(argv[++i]);
 				break;
 			case 'e':
 				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
@@ -79,11 +80,11 @@ char  *argv[];
 		exit(1);
 	}
 	if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) {
-		fprintf(stderr, "can't open output \"%s\"\n",
+		fprintf(stderr, "%s: can't open output \"%s\"\n",
 				progname, argv[i+1]);
 		exit(1);
 	}
-	setcolrgam(gamma);
+	setcolrgam(gamcor);
 	if (reverse) {
 					/* get header */
 		if (read(fileno(stdin), inpbuf, 2) != 2 || inpbuf[0] != 'P')
@@ -159,7 +160,6 @@ ppm2ra(getscan)		/* convert color Pixmap to Radiance p
 int  (*getscan)();
 {
 	COLR	*scanout;
-	register int	x;
 	int	y;
 						/* allocate scanline */
 	scanout = (COLR *)malloc(xmax*sizeof(COLR));