--- ray/src/px/ra_ps.c 1998/08/28 10:03:46 2.21 +++ ray/src/px/ra_ps.c 2004/03/28 20:33:14 2.28 @@ -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.28 2004/03/28 20:33:14 schorsch Exp $"; #endif - /* * Radiance picture to PostScript file translator -- one way! */ #include +#include #include #include -#ifdef MSDOS -#include -#endif + +#include "platform.h" #include "color.h" +#include "resolu.h" #define UPPER(c) ((c)&~0x20) /* ASCII trick */ @@ -53,20 +51,33 @@ int docolor = 1; /* produce color image? */ int bradj = 0; /* brightness adjustment */ int ncopies = 1; /* number of copies */ -extern int Aputprim(), Bputprim(), Cputprim(); +char *progname; +int xmax, ymax; /* input image dimensions */ -int (*putprim)() = Aputprim; /* function for writing scanline */ +typedef void putprimf_t(COLR *scn, int pri); -char *progname; +static gethfunc headline; +static putprimf_t Aputprim, Bputprim, Cputprim; -int xmax, ymax; /* input image dimensions */ +static double unit2inch(register char *s); +static int matchid(char *name, char *id); +static void parsepaper(char *ps); +static void quiterr(char *err); +static void PSheader(int ac, char **av); +static void PStrailer(void); +static void PSprocdef(char *nam); +static void ra2ps(void); +static void putrle(int cnt, int cod); -extern char *malloc(); -extern double unit2inch(); +putprimf_t *putprim = Aputprim; /* function for writing scanline */ -headline(s) /* check header line */ -char *s; + +static int +headline( /* check header line */ + char *s, + void *p +) { char fmt[32]; @@ -75,12 +86,11 @@ char *s; wrongformat = strcmp(fmt, COLRFMT); } else if (isaspect(s)) pixaspect *= aspectval(s); + return(0); } - -main(argc, argv) -int argc; -char *argv[]; +int +main(int argc, char *argv[]) { int i; double d; @@ -158,9 +168,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) @@ -187,15 +195,16 @@ userr: } -double -unit2inch(s) /* determine unit */ -register char *s; +static double +unit2inch( /* 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)) @@ -207,10 +216,11 @@ register char *s; } -int -matchid(name, id) /* see if name matches id (case insensitive) */ -char *name; -register char *id; +static int +matchid( /* see if name matches id (case insensitive) */ + char *name, + register char *id +) { register char *s = name; @@ -226,30 +236,32 @@ register char *id; } -parsepaper(ps) /* determine paper size from name */ -char *ps; +static void +parsepaper( /* 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; @@ -262,7 +274,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++) @@ -281,8 +293,10 @@ char *ps; } -quiterr(err) /* print message and exit */ -char *err; +static void +quiterr( /* print message and exit */ + char *err +) { if (err != NULL) { fprintf(stderr, "%s: %s\n", progname, err); @@ -292,9 +306,11 @@ char *err; } -PSheader(ac, av) /* print PostScript header */ -int ac; -char **av; +static void +PSheader( /* print PostScript header */ + int ac, + char **av +) { char *rstr; int landscape, rotate, n; @@ -303,20 +319,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; @@ -391,7 +407,8 @@ char **av; } -PStrailer() /* print PostScript trailer */ +static void +PStrailer(void) /* print PostScript trailer */ { puts("%%Trailer"); if (ncopies > 1) @@ -403,8 +420,10 @@ PStrailer() /* print PostScript trailer */ } -PSprocdef(nam) /* define PS procedure to read image */ -char *nam; +static void +PSprocdef( /* define PS procedure to read image */ + char *nam +) { short itab[128]; register int i; @@ -412,9 +431,9 @@ char *nam; for (i = 0; i < 128; i++) /* clear */ itab[i] = -1; for (i = 1; i < 63; i++) /* assign greys */ - itab[code[i]] = 256.0*pow((i+.5)/64.0, CODE6GAM/devgam); - itab[code[0]] = 0; /* black is black */ - itab[code[63]] = 255; /* and white is white */ + itab[(int)code[i]] = 256.0*pow((i+.5)/64.0, CODE6GAM/devgam); + itab[(int)code[0]] = 0; /* black is black */ + itab[(int)code[63]] = 255; /* and white is white */ printf("/codetab ["); for (i = 0; i < 128; i++) { if (!(i & 0xf)) @@ -443,7 +462,8 @@ char *nam; } -ra2ps() /* convert Radiance scanlines to 6-bit */ +static void +ra2ps(void) /* convert Radiance scanlines to 6-bit */ { register COLR *scanin; int y; @@ -472,14 +492,15 @@ ra2ps() /* convert Radiance scanlines to 6-bit */ } putchar('\n'); /* free scanline */ - free((char *)scanin); + free((void *)scanin); } -int -Aputprim(scn, pri) /* put out hex ASCII primary from scanline */ -COLR *scn; -int pri; +static void +Aputprim( /* put out hex ASCII primary from scanline */ + COLR *scn, + int pri +) { static char hexdigit[] = "0123456789ABCDEF"; static int col = 0; @@ -501,10 +522,11 @@ int pri; } -int -Bputprim(scn, pri) /* put out binary primary from scanline */ -COLR *scn; -int pri; +static void +Bputprim( /* put out binary primary from scanline */ + COLR *scn, + int pri +) { register int x, c; @@ -519,10 +541,11 @@ int pri; } -int -Cputprim(scn, pri) /* put out compressed primary from scanline */ -COLR *scn; -int pri; +static void +Cputprim( /* put out compressed primary from scanline */ + COLR *scn, + int pri +) { register int c; register int x; @@ -548,8 +571,11 @@ int pri; } -putrle(cnt, cod) /* put out cnt of cod */ -register int cnt, cod; +static void +putrle( /* put out cnt of cod */ + register int cnt, + register int cod +) { static int col = 0;