--- ray/src/px/ra_ps.c	1997/09/26 14:20:38	2.20
+++ ray/src/px/ra_ps.c	2003/06/05 19:29:34	2.25
@@ -1,9 +1,6 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: ra_ps.c,v 2.25 2003/06/05 19:29:34 schorsch Exp $";
 #endif
-
 /*
  *  Radiance picture to PostScript file translator -- one way!
  */
@@ -11,15 +8,15 @@ static char SCCSid[] = "$SunId$ SGI";
 #include  <stdio.h>
 #include  <math.h>
 #include  <ctype.h>
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
+
+#include  "platform.h"
 #include  "color.h"
 
 #define UPPER(c)	((c)&~0x20)		/* ASCII trick */
 
 #define CODE6GAM	1.47			/* gamma for 6-bit codes */
-#define DEFDGAM		1.0			/* default device gamma */
+#define DEFGGAM		1.0			/* greyscale device gamma */
+#define DEFCGAM		1.8			/* color device gamma */
 
 #define GRY		-1			/* artificial index for grey */
 
@@ -42,13 +39,13 @@ char  code[] =			/* 6-bit code lookup table */
 int  wrongformat = 0;			/* input in wrong format? */
 double	pixaspect = 1.0;		/* pixel aspect ratio */
 
-double  devgam = DEFDGAM;		/* device gamma response */
+double  devgam = 0.;			/* device gamma response */
 double  hmarg = DEFMARG,
 	vmarg = DEFMARG;		/* horizontal and vertical margins */
 double	width = DEFWIDTH,
 	height = DEFHEIGHT;		/* default paper width and height */
 double  dpi = 0;			/* print density (0 if unknown) */
-int  docolor = 0;			/* produce color image? */
+int  docolor = 1;			/* produce color image? */
 int  bradj = 0;				/* brightness adjustment */
 int  ncopies = 1;			/* number of copies */
 
@@ -60,10 +57,10 @@ char  *progname;
 
 int  xmax, ymax;			/* input image dimensions */
 
-extern char  *malloc();
 extern double	unit2inch();
 
 
+int
 headline(s)		/* check header line */
 char  *s;
 {
@@ -74,6 +71,7 @@ char  *s;
 		wrongformat = strcmp(fmt, COLRFMT);
 	} else if (isaspect(s))
 		pixaspect *= aspectval(s);
+	return(0);
 }
 
 
@@ -157,20 +155,20 @@ char  *argv[];
 				progname, argv[i+1]);
 		exit(1);
 	}
-#ifdef MSDOS
-	setmode(fileno(stdin), O_BINARY);
-#endif
+	SET_FILE_BINARY(stdin);
 				/* get our header */
 	getheader(stdin, headline, NULL);
 	if (wrongformat || fgetresolu(&xmax, &ymax, stdin) < 0)
 		quiterr("bad picture format");
 				/* gamma compression */
+	if (devgam <= 0.05)
+		devgam = docolor ? DEFCGAM : DEFGGAM;
 	if (putprim == Cputprim)
 		setcolrgam(CODE6GAM);
 	else if (devgam != 1.)
 		setcolrgam(devgam);
 				/* write header */
-	PSheader(i <= argc-1 ? argv[i] : "<stdin>");
+	PSheader(argc, argv);
 				/* convert file */
 	ra2ps();
 				/* write trailer */
@@ -188,7 +186,7 @@ double
 unit2inch(s)		/* determine unit */
 register char	*s;
 {
-	static struct unit {char n; float f} u[] = {
+	static struct unit {char n; float f;} u[] = {
 		'i', 1.,
 		'm', 1./25.4,
 		'c', 1./2.54,
@@ -289,8 +287,9 @@ char  *err;
 }
 
 
-PSheader(name)			/* print PostScript header */
-char  *name;
+PSheader(ac, av)		/* print PostScript header */
+int  ac;
+char  **av;
 {
 	char  *rstr;
 	int  landscape, rotate, n;
@@ -298,8 +297,8 @@ char  *name;
 	double	iwidth, iheight;
 					/* EPS comments */
 	puts("%!PS-Adobe-2.0 EPSF-2.0");
-	printf("%%%%Title: %s\n", name);
-	printf("%%%%Creator: %s = %s\n", progname, SCCSid);
+	printf("%%%%Title: "); printargs(ac, av, stdout);
+	printf("%%%%Creator: %s\n", progname);
 	printf("%%%%Pages: %d\n", ncopies);
 	if (landscape = xmax > pixaspect*ymax)
 		puts("%%Orientation: Landscape");
@@ -468,7 +467,7 @@ ra2ps()				/* convert Radiance scanlines to 6-bit */
 	}
 	putchar('\n');
 						/* free scanline */
-	free((char *)scanin);
+	free((void *)scanin);
 }