--- ray/src/px/ra_ps.c 1998/08/28 10:03:46 2.21 +++ 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,9 +8,8 @@ static char SCCSid[] = "$SunId$ SGI"; #include #include #include -#ifdef MSDOS -#include -#endif + +#include "platform.h" #include "color.h" #define UPPER(c) ((c)&~0x20) /* ASCII trick */ @@ -61,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; { @@ -75,6 +71,7 @@ char *s; wrongformat = strcmp(fmt, COLRFMT); } else if (isaspect(s)) pixaspect *= aspectval(s); + return(0); } @@ -158,9 +155,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) @@ -191,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, @@ -303,7 +298,7 @@ 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) puts("%%Orientation: Landscape"); @@ -472,7 +467,7 @@ ra2ps() /* convert Radiance scanlines to 6-bit */ } putchar('\n'); /* free scanline */ - free((char *)scanin); + free((void *)scanin); }