--- ray/src/px/ra_skel.c	1992/12/17 15:50:13	2.4
+++ ray/src/px/ra_skel.c	2003/02/22 02:07:28	2.11
@@ -1,14 +1,11 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: ra_skel.c,v 2.11 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  Skeletal 24-bit image conversion program.  Replace "skel"
  *  in this file with a more appropriate image type identifier.
  *
- *  The Makefile entry should look something like this:
+ *  The Rmakefile entry should look something like this:
  *	ra_skel:	ra_skel.o
  *		cc $(CFLAGS) -o ra_skel ra_skel.o -lrt -lm
  *	ra_skel.o:	../common/color.h ../common/resolu.h
@@ -19,16 +16,16 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include  <stdio.h>
+#include  <math.h>
 #ifdef MSDOS
 #include  <fcntl.h>
 #endif
+#include  <time.h>
 #include  "color.h"
 #include  "resolu.h"
 
-extern char  *malloc();
+double	gamcor = 2.2;			/* gamma correction */
 
-double	gamma = 2.2;			/* gamma correction */
-
 int  bradj = 0;				/* brightness adjustment */
 
 char  *progname;
@@ -49,7 +46,7 @@ char  *argv[];
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
 			case 'g':		/* gamma correction */
-				gamma = atof(argv[++i]);
+				gamcor = atof(argv[++i]);
 				break;
 			case 'e':		/* exposure adjustment */
 				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
@@ -73,7 +70,7 @@ 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);
 	}
@@ -81,11 +78,12 @@ char  *argv[];
 	setmode(fileno(stdin), O_BINARY);
 	setmode(fileno(stdout), O_BINARY);
 #endif
-	setcolrgam(gamma);		/* set up gamma correction */
+	setcolrgam(gamcor);		/* set up gamma correction */
 	if (reverse) {
 					/* get their image resolution */
 		read_skel_head(&xmax, &ymax);
 					/* put our header */
+		newheader("RADIANCE", stdout);
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
@@ -133,10 +131,12 @@ skel2ra()		/* convert 24-bit scanlines to Radiance pic
 		quiterr("out of memory in skel2ra");
 						/* convert image */
 	for (y = ymax-1; y >= 0; y--) {
-		scanout[x][RED] = getc(stdin);
-		scanout[x][GRN] = getc(stdin);
-		scanout[x][BLU] = getc(stdin);
-		if (feof(stdin) || ferror(stdin))
+		for (x = 0; x < xmax; x++) {
+			scanout[x][RED] = getc(stdin);
+			scanout[x][GRN] = getc(stdin);
+			scanout[x][BLU] = getc(stdin);
+		}
+		if (feof(stdin) | ferror(stdin))
 			quiterr("error reading skel image");
 						/* undo gamma */
 		gambs_colrs(scanout, xmax);
@@ -146,7 +146,7 @@ skel2ra()		/* convert 24-bit scanlines to Radiance pic
 			quiterr("error writing Radiance picture");
 	}
 						/* free scanline */
-	free((char *)scanout);
+	free((void *)scanout);
 }
 
 
@@ -175,5 +175,5 @@ ra2skel()		/* convert Radiance scanlines to 24-bit */
 			quiterr("error writing skel file");
 	}
 						/* free scanline */
-	free((char *)scanin);
+	free((void *)scanin);
 }