--- ray/src/px/psign.c 1993/01/08 13:14:14 2.14 +++ ray/src/px/psign.c 2003/02/22 02:07:27 2.18 @@ -1,9 +1,6 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: psign.c,v 2.18 2003/02/22 02:07:27 greg Exp $"; #endif - /* * psign.c - produce picture from text. * @@ -16,8 +13,6 @@ static char SCCSid[] = "$SunId$ LBL"; #include "font.h" -#include "paths.h" - #ifndef SSS #define SSS 3 /* super-sample size */ #endif @@ -48,8 +43,6 @@ int xdim; /* size of horizontal scan (bytes) */ FONT *ourfont; /* our font */ -char *libpath; /* library search path */ - typedef struct line { char *s; /* line w/o LF */ short *sp; /* character spacing */ @@ -126,8 +119,6 @@ unkopt: exit(1); } /* load font file */ - if ((libpath = getenv(ULIBVAR)) == NULL) - libpath = DEFPATH; ourfont = getfont(fontfile); /* get text */ if (an == argc) @@ -140,6 +131,7 @@ unkopt: /* convert text to bitmap */ maptext(); /* print header */ + newheader("RADIANCE", stdout); printargs(argc, argv, stdout); fputformat(COLRFMT, stdout); putchar('\n'); @@ -216,7 +208,6 @@ makemap() /* create the bit map */ gettext(fp) /* get text from a file */ FILE *fp; { - char *fgets(); char buf[MAXLINE]; register LINE *curl; int len; @@ -229,7 +220,7 @@ FILE *fp; if (curl == NULL) goto memerr; len = strlen(buf); - curl->s = malloc(len); + curl->s = (char *)malloc(len); curl->sp = (short *)malloc(sizeof(short)*len--); if (curl->s == NULL | curl->sp == NULL) goto memerr; @@ -266,7 +257,7 @@ char *av[]; ourtext = (LINE *)malloc(sizeof(LINE)); if (ourtext == NULL) goto memerr; - ourtext->s = malloc(MAXLINE); + ourtext->s = (char *)malloc(MAXLINE); if (ourtext->s == NULL) goto memerr; for (cp = ourtext->s; ac-- > 0; av++) { @@ -444,5 +435,5 @@ FILE *fp; exit(1); } } - free((char *)scanout); + free((void *)scanout); }