--- ray/src/px/pfilt.c 2004/03/28 20:33:14 2.29 +++ ray/src/px/pfilt.c 2018/07/26 23:50:40 2.32 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pfilt.c,v 2.29 2004/03/28 20:33:14 schorsch Exp $"; +static const char RCSid[] = "$Id: pfilt.c,v 2.32 2018/07/26 23:50:40 greg Exp $"; #endif /* * pfilt.c - program to post-process picture file. @@ -85,8 +85,8 @@ int orad = 0; /* output window radius */ char *progname; static gethfunc headline; -static double rgb_bright(COLOR clr); -static double xyz_bright(COLOR clr); +static brightfunc_t rgb_bright; +static brightfunc_t xyz_bright; static void copyfile(FILE *in, FILE *out); static void pass1(FILE *in); static void pass2(FILE *in); @@ -340,9 +340,8 @@ xyz_bright( } -double (*ourbright)() = rgb_bright; +brightfunc_t *ourbright = rgb_bright; - static int headline( /* process line from header */ char *s, @@ -372,11 +371,11 @@ headline( /* process line from header */ static void copyfile( /* copy a file */ - register FILE *in, - register FILE *out + FILE *in, + FILE *out ) { - register int c; + int c; while ((c = getc(in)) != EOF) putc(c, out); @@ -481,7 +480,7 @@ scan2init(void) /* prepare scanline arrays */ { COLOR ctmp; double d; - register int i; + int i; xbrad = xres/ncols/2 + 1; ybrad = yres/nrows/2 + 1; @@ -562,7 +561,7 @@ scan2sync( /* synchronize grey averages and output s static int nextrow = 0; COLOR ctmp; int ybot; - register int c; + int c; /* average input scanlines */ while (nextrow <= r+orad && nextrow < nrows) { ybot = (nextrow+.5)*yres/nrows; @@ -585,7 +584,7 @@ scan2sync( /* synchronize grey averages and output s static void scan2flush(void) /* flush output buffer */ { - register int r; + int r; for (r = nrows-orad; r < nrows; r++) if (fwritescan(scoutbar[r%obarsize], ncols, stdout) < 0)