--- ray/src/px/ra_pr.c	1990/01/18 23:58:19	1.5
+++ ray/src/px/ra_pr.c	1991/12/19 14:52:14	2.2
@@ -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";
@@ -17,6 +17,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "color.h"
 
+#include  "resolu.h"
+
 #include  "pic.h"
 
 			/* descriptor for a picture file or frame buffer */
@@ -37,17 +39,19 @@ extern char	*ecalloc(), *emalloc();
 
 extern long  ftell();
 
-extern double  atof(), pow();
+extern double  pow();
 
-double	gamma = 2.0;			/* gamma correction */
+double	gamma = 2.2;			/* gamma correction */
 
+int  bradj = 0;				/* brightness adjustment */
+
 pic	*inpic, *outpic;
 
 char  *progname;
 
 char  errmsg[128];
 
-COLR	*inline;
+COLR	*inl;
 
 int  xmax, ymax;
 
@@ -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;
@@ -113,13 +122,14 @@ char  *argv[];
 				head.ras_depth != 8)
 			quiterr("incompatible format");
 					/* put header */
-		printargs(argc, argv, stdout);
+		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]);
@@ -139,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);
 }
@@ -185,10 +195,10 @@ register struct rasterfile  *h;
 		p->fp = stdin;
 	else if ((p->fp = fopen(fname, "r")) == NULL)
 		return(NULL);
-					/* discard header */
-	getheader(p->fp, NULL);
-	if (fgetresolu(&xmax, &ymax, p->fp) != (YMAJOR|YDECR))
-		quiterr("bad picture size");
+					/* check header */
+	if (checkheader(p->fp, COLRFMT, NULL) < 0 ||
+			fgetresolu(&xmax, &ymax, p->fp) < 0)
+		quiterr("bad picture format");
 	p->nexty = 0;
 	p->bytes_line = 0;		/* variable length lines */
 	p->pos.y = (long *)ecalloc(ymax, sizeof(long));
@@ -203,7 +213,7 @@ register struct rasterfile  *h;
 	h->ras_maptype = RMT_EQUAL_RGB;
 	h->ras_maplength = 256*3;
 					/* allocate scanline */
-	inline = (COLR *)emalloc(xmax*sizeof(COLR));
+	inl = (COLR *)emalloc(xmax*sizeof(COLR));
 
 	return(p);
 }
@@ -251,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++) {
@@ -277,7 +289,7 @@ register rgbpixel  *l3;
 		if (inpic->bytes_line == 0) {
 			if (inpic->pos.y[y] == 0) {
 				while (inpic->nexty < y) {
-					if (freadcolrs(inline, xmax, inpic->fp) < 0)
+					if (freadcolrs(inl, xmax, inpic->fp) < 0)
 						quiterr("read error in picreadline3");
 					inpic->pos.y[++inpic->nexty] = ftell(inpic->fp);
 				}
@@ -287,15 +299,15 @@ register rgbpixel  *l3;
 			quiterr("seek error in picreadline3");
 	} else if (inpic->bytes_line == 0 && inpic->pos.y[inpic->nexty] == 0)
 		inpic->pos.y[inpic->nexty] = ftell(inpic->fp);
-	if (freadcolrs(inline, xmax, inpic->fp) < 0)	/* read scanline */
+	if (freadcolrs(inl, xmax, inpic->fp) < 0)	/* read scanline */
 		quiterr("read error in picreadline3");
 	inpic->nexty = y+1;
 							/* convert scanline */
-	normcolrs(inline, xmax);
+	normcolrs(inl, xmax, bradj);
 	for (i = 0; i < xmax; i++) {
-		l3[i].r = inline[i][RED];
-		l3[i].g = inline[i][GRN];
-		l3[i].b = inline[i][BLU];
+		l3[i].r = inl[i][RED];
+		l3[i].g = inl[i][GRN];
+		l3[i].b = inl[i][BLU];
 	}
 }
 
@@ -349,7 +361,7 @@ colormap  map;
 	register int  i, val;
 
 	for (i = 0; i < 256; i++) {
-		val = pow(i/256.0, 1.0/gamma) * 256.0;
+		val = pow((i+0.5)/256.0, 1.0/gamma) * 256.0;
 		map[0][i] = map[1][i] = map[2][i] = val;
 	}
 }