--- ray/src/px/pfilt.c 1996/10/02 16:56:16 2.19 +++ ray/src/px/pfilt.c 2003/02/25 00:26:05 2.22 @@ -1,9 +1,6 @@ -/* Copyright (c) 1996 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pfilt.c,v 2.22 2003/02/25 00:26:05 greg Exp $"; #endif - /* * pfilt.c - program to post-process picture file. * @@ -19,15 +16,13 @@ static char SCCSid[] = "$SunId$ LBL"; #include "view.h" -#include "resolu.h" - #include "paths.h" extern float *matchlamp(); #define FEQ(a,b) ((a) >= .98*(b) && (a) <= 1.02*(b)) -double CHECKRAD = 1.5; /* radius to check for filtering */ +double CHECKRAD = 2.0; /* radius to check for filtering */ #define THRESHRAD 5.0 /* maximum sample spread in output */ @@ -92,8 +87,7 @@ main(argc, argv) int argc; char **argv; { - extern long ftell(); - extern int quit(), headline(); + extern int headline(); FILE *fin; float *lampcolor; char *lamptype = NULL; @@ -205,7 +199,7 @@ char **argv; case 'm': thresh = atof(argv[++i]); if (rad <= FTINY) - rad = 1.0; + rad = 0.6; break; case 'b': rad = thresh = 0.0; @@ -332,6 +326,7 @@ COLOR clr; double (*ourbright)() = rgb_bright; +int headline(s) /* process line from header */ char *s; { @@ -352,6 +347,7 @@ char *s; wrongformat = !globmatch(PICFMT, fmt); } else if (isview(s) && sscanview(&ourview, s) > 0) gotview++; + return(0); } @@ -399,7 +395,7 @@ FILE *in; } pass1scan(scan, i); } - free((char *)scan); + free((void *)scan); } @@ -571,6 +567,7 @@ scan2flush() /* flush output buffer */ } +void quit(code) /* remove temporary file and exit */ int code; {