--- ray/src/gen/mkillum.c 2012/10/13 20:15:43 2.39 +++ ray/src/gen/mkillum.c 2016/09/15 22:34:41 2.42 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: mkillum.c,v 2.39 2012/10/13 20:15:43 greg Exp $"; +static const char RCSid[] = "$Id: mkillum.c,v 2.42 2016/09/15 22:34:41 greg Exp $"; #endif /* * Make illum sources for optimizing rendering process @@ -8,7 +8,7 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.39 201 #include #include -#include "rtprocess.h" /* win_popen() */ +#include "paths.h" /* win_popen() */ #include "mkillum.h" /* default parameters */ @@ -24,7 +24,6 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.39 201 struct illum_args thisillum = { /* our illum and default values */ 0, - 0., DFLMAT, DFLDAT, 0, @@ -46,10 +45,10 @@ int doneheader = 0; /* printed header yet? */ int warnings = 1; /* print warnings? */ void init(char *octnm, int np); -void filter(register FILE *infp, char *name); +void filter(FILE *infp, char *name); void xoptions(char *s, char *nm); void printopts(void); -void printhead(register int ac, register char **av); +void printhead(int ac, char **av); void xobject(FILE *fp, char *nm); @@ -62,7 +61,7 @@ main( /* compute illum distributions using rtrace */ int nprocs = 1; FILE *fp; int rval; - register int i; + int i; /* set global arguments */ gargv = argv; progname = gargv[0]; @@ -149,7 +148,7 @@ init(char *octnm, int np) /* start rendering process( void eputs( /* put string to stderr */ - register char *s + char *s ) { static int midline = 0; @@ -185,13 +184,13 @@ int ec; void filter( /* process stream */ - register FILE *infp, + FILE *infp, char *name ) { char buf[512]; FILE *pfp; - register int c; + int c; while ((c = getc(infp)) != EOF) { if (isspace(c)) @@ -223,11 +222,10 @@ xoptions( /* process options in string s */ char *nm ) { - extern FILE *freopen(); char buf[64]; int negax; int nerrs = 0; - register char *cp; + char *cp; if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) { fputs(s, stdout); /* not for us */ @@ -360,16 +358,6 @@ xoptions( /* process options in string s */ } doneheader = 0; continue; - case 't': /* object thickness */ - if (*++cp != '=') - break; - if (!isfltd(++cp, " \t\n\r")) - break; - thisillum.thick = atof(cp); - if (thisillum.thick < .0) - thisillum.thick = .0; - cp = sskip(cp); - continue; case '!': /* processed file! */ sprintf(errmsg, "(%s): already processed!", nm); error(WARNING, errmsg); @@ -415,14 +403,13 @@ printopts(void) /* print out option default values * printf("d=%d\t\t\t\t# density of directions\n", thisillum.sampdens); printf("s=%d\t\t\t\t# samples per direction\n", thisillum.nsamps); printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt); - printf("t=%f\t\t\t# object thickness\n", thisillum.thick); } void printhead( /* print out header */ - register int ac, - register char **av + int ac, + char **av ) { putchar('#');