--- ray/src/px/ra_ps.c	1998/10/27 09:08:27	2.22
+++ ray/src/px/ra_ps.c	2004/01/02 12:47:01	2.27
@@ -1,20 +1,18 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: ra_ps.c,v 2.27 2004/01/02 12:47:01 schorsch Exp $";
 #endif
-
 /*
  *  Radiance picture to PostScript file translator -- one way!
  */
 
 #include  <stdio.h>
+#include  <string.h>
 #include  <math.h>
 #include  <ctype.h>
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
+
+#include  "platform.h"
 #include  "color.h"
+#include  "resolu.h"
 
 #define UPPER(c)	((c)&~0x20)		/* ASCII trick */
 
@@ -61,13 +59,16 @@ char  *progname;
 
 int  xmax, ymax;			/* input image dimensions */
 
-extern char  *malloc();
 extern double	unit2inch();
 
+static gethfunc headline;
 
-int
-headline(s)		/* check header line */
-char  *s;
+
+static int
+headline(		/* check header line */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -160,9 +161,7 @@ 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)
@@ -193,11 +192,11 @@ double
 unit2inch(s)		/* determine unit */
 register char	*s;
 {
-	static struct unit {char n; float f} u[] = {
-		'i', 1.,
-		'm', 1./25.4,
-		'c', 1./2.54,
-		'\0' };
+	static struct unit {char n; float f;} u[] = {
+		{'i', 1.},
+		{'m', 1./25.4},
+		{'c', 1./2.54},
+		{'\0',0} };
 	register struct unit	*up;
 
 	while (*s && !isalpha(*s))
@@ -232,26 +231,26 @@ parsepaper(ps)		/* determine paper size from name */
 char	*ps;
 {
 	static struct psize {char n[12]; float w,h;} p[] = {
-		"envelope", 4.12, 9.5,
-		"executive", 7.25, 10.5,
-		"letter", 8.5, 11.,
-		"lettersmall", 7.68, 10.16,
-		"legal", 8.5, 14.,
-		"monarch", 3.87, 7.5,
-		"statement", 5.5, 8.5,
-		"tabloid", 11., 17.,
-		"A3", 11.69, 16.54,
-		"A4", 8.27, 11.69,
-		"A4small", 7.47, 10.85,
-		"A5", 6.00, 8.27,
-		"A6", 4.13, 6.00,
-		"B4", 10.12, 14.33,
-		"B5", 7.17, 10.12,
-		"C5", 6.38, 9.01,
-		"C6", 4.49, 6.38,
-		"DL", 4.33, 8.66,
-		"hagaki", 3.94, 5.83,
-		"" };
+		{"envelope", 4.12, 9.5},
+		{"executive", 7.25, 10.5},
+		{"letter", 8.5, 11.},
+		{"lettersmall", 7.68, 10.16},
+		{"legal", 8.5, 14.},
+		{"monarch", 3.87, 7.5},
+		{"statement", 5.5, 8.5},
+		{"tabloid", 11., 17.},
+		{"A3", 11.69, 16.54},
+		{"A4", 8.27, 11.69},
+		{"A4small", 7.47, 10.85},
+		{"A5", 6.00, 8.27},
+		{"A6", 4.13, 6.00},
+		{"B4", 10.12, 14.33},
+		{"B5", 7.17, 10.12},
+		{"C5", 6.38, 9.01},
+		{"C6", 4.49, 6.38},
+		{"DL", 4.33, 8.66},
+		{"hagaki", 3.94, 5.83},
+		{"",0.0,0.0} };
 	register struct psize	*pp;
 	register char	*s = ps;
 	double	d;
@@ -264,7 +263,7 @@ char	*ps;
 		height = atof(++s);
 		width *= d;
 		height *= d;
-		if (width >= 1. & height >= 1.)
+		if ((width >= 1.) & (height >= 1.))
 			return;
 	} else				/* check for match to standard size */
 		for (pp = p; pp->n[0]; pp++)
@@ -305,20 +304,20 @@ char  **av;
 					/* EPS comments */
 	puts("%!PS-Adobe-2.0 EPSF-2.0");
 	printf("%%%%Title: "); printargs(ac, av, stdout);
-	printf("%%%%Creator: %s\n", SCCSid);
+	printf("%%%%Creator: %s\n", progname);
 	printf("%%%%Pages: %d\n", ncopies);
-	if (landscape = xmax > pixaspect*ymax)
+	if ( (landscape = xmax > pixaspect*ymax) )
 		puts("%%Orientation: Landscape");
 	else
 		puts("%%Orientation: Portrait");
-	if (rotate = PWIDTH > PHEIGHT ^ landscape) {
+	if ( (rotate = (PWIDTH > PHEIGHT) ^ landscape) ) {
 		pwidth = PHEIGHT;
 		pheight = PWIDTH;
 	} else {
 		pwidth = PWIDTH;
 		pheight = PHEIGHT;
 	}
-	if (dpi > 100 && pixaspect >= 0.99 & pixaspect <= 1.01)
+	if (dpi > 100 && (pixaspect >= 0.99) & (pixaspect <= 1.01))
 		if (pheight/pwidth > ymax/xmax) {
 			n = pwidth*dpi/xmax;	/* floor */
 			iwidth = n > 0 ? (double)(n*xmax)/dpi : pwidth;
@@ -474,7 +473,7 @@ ra2ps()				/* convert Radiance scanlines to 6-bit */
 	}
 	putchar('\n');
 						/* free scanline */
-	free((char *)scanin);
+	free((void *)scanin);
 }