--- ray/src/px/ra_pr.c	1991/04/18 14:35:38	1.10
+++ ray/src/px/ra_pr.c	1992/10/02 16:25:33	2.3
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -13,10 +13,14 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#include  <math.h>
+
 #include  "rasterfile.h"
 
 #include  "color.h"
 
+#include  "resolu.h"
+
 #include  "pic.h"
 
 			/* descriptor for a picture file or frame buffer */
@@ -37,9 +41,9 @@ extern char	*ecalloc(), *emalloc();
 
 extern long  ftell();
 
-extern double  atof(), pow();
+double	gamma = 2.2;			/* gamma correction */
 
-double	gamma = 2.0;			/* gamma correction */
+int  bradj = 0;				/* brightness adjustment */
 
 pic	*inpic, *outpic;
 
@@ -78,6 +82,11 @@ char  *argv[];
 			case 'b':
 				greyscale = !greyscale;
 				break;
+			case 'e':
+				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
+					goto userr;
+				bradj = atoi(argv[++i]);
+				break;
 			case 'r':
 				reverse = !reverse;
 				break;
@@ -116,11 +125,11 @@ char  *argv[];
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
-		fputresolu(YMAJOR|YDECR, xmax, ymax, stdout);
+		fprtresolu(xmax, ymax, stdout);
 					/* convert file */
 		pr2ra(&head);
 	} else {
-		if (i > argc-1 || i < argc-2)
+		if (i < argc-2 || (!greyscale && i > argc-1))
 			goto userr;
 		if ((inpic = openinput(argv[i], &head)) == NULL) {
 			sprintf(errmsg, "can't open input \"%s\"", argv[i]);
@@ -140,9 +149,9 @@ char  *argv[];
 	quiterr(NULL);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-d][-c ncolors][-b][-g gamma] input [output]\n",
+	"Usage: %s [-d][-c ncolors][-b][-g gamma][-e +/-stops] input [output]\n",
 			progname);
-	fprintf(stderr, "   Or: %s -r [-g gamma] [input [output]]\n",
+	fprintf(stderr, "   Or: %s -r [-g gamma][-e +/-stops] [input [output]]\n",
 			progname);
 	exit(1);
 }
@@ -188,7 +197,7 @@ register struct rasterfile  *h;
 		return(NULL);
 					/* check header */
 	if (checkheader(p->fp, COLRFMT, NULL) < 0 ||
-			fgetresolu(&xmax, &ymax, p->fp) != (YMAJOR|YDECR))
+			fgetresolu(&xmax, &ymax, p->fp) < 0)
 		quiterr("bad picture format");
 	p->nexty = 0;
 	p->bytes_line = 0;		/* variable length lines */
@@ -252,6 +261,8 @@ struct rasterfile  *h;
 				pow((cmap[0][i]+.5)/256.,gamma),
 				pow((cmap[1][i]+.5)/256.,gamma),
 				pow((cmap[2][i]+.5)/256.,gamma));
+	if (bradj)
+		shiftcolrs(ctab, 256, bradj);
 					/* convert file */
 	for (i = 0; i < ymax; i++) {
 		for (j = 0; j < xmax; j++) {
@@ -292,7 +303,7 @@ register rgbpixel  *l3;
 		quiterr("read error in picreadline3");
 	inpic->nexty = y+1;
 							/* convert scanline */
-	normcolrs(inl, xmax, 0);
+	normcolrs(inl, xmax, bradj);
 	for (i = 0; i < xmax; i++) {
 		l3[i].r = inl[i][RED];
 		l3[i].g = inl[i][GRN];