--- ray/src/px/pfilt.c	1995/10/16 12:04:36	2.15
+++ ray/src/px/pfilt.c	2003/06/05 19:29:34	2.23
@@ -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: pfilt.c,v 2.23 2003/06/05 19:29:34 schorsch Exp $";
 #endif
-
 /*
  *  pfilt.c - program to post-process picture file.
  *
@@ -11,21 +8,18 @@ static char SCCSid[] = "$SunId$ LBL";
  *     6/23/93	Added additional buffers for value spreading
  */
 
-#include  "standard.h"
-
 #include  <signal.h>
 
+#include  "standard.h"
 #include  "color.h"
-
-#include  "resolu.h"
-
+#include  "view.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 */
 
@@ -64,6 +58,12 @@ int  correctaspect = 0;		/* aspect ratio correction? *
 
 int  wrongformat = 0;
 
+VIEW  ourview = STDVIEW;
+int  gotview = 0;
+int  wrapfilt = 0;		/* wrap filter horizontally? */
+
+int  estatus = 0;		/* exit status (for non-fatal errors) */
+
 int  xrad;			/* x search radius */
 int  yrad;			/* y search radius */
 int  xbrad;			/* x box size */
@@ -84,8 +84,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;
@@ -93,12 +92,9 @@ char  **argv;
 	double	outaspect = 0.0;
 	double	d;
 	int  i, j;
-#ifdef MSDOS
-	extern int  _fmode;
-	_fmode = O_BINARY;
-	setmode(fileno(stdin), O_BINARY);
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	if (signal(SIGINT, quit) == SIG_IGN)
 		signal(SIGINT, SIG_IGN);
 	if (signal(SIGHUP, quit) == SIG_IGN)
@@ -147,7 +143,7 @@ char  **argv;
 					fprintf(stderr,
 						"%s: exposure out of range\n",
 							argv[0]);
-					exit(1);
+					quit(1);
 				}
 				switch (argv[i][2]) {
 				case '\0':
@@ -197,7 +193,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;
@@ -267,6 +263,9 @@ char  **argv;
 	}
 	if (!(order & YMAJOR))
 		inpaspect = 1.0/inpaspect;
+					/* wrap around for cylindrical view? */
+	wrapfilt = gotview && ourview.type == VT_CYL &&
+			ourview.horiz >= 360.-FTINY && order & YMAJOR;
 					/* compute output resolution */
 	if (ncols <= 0)
 		ncols = x_c*xres + .5;
@@ -298,7 +297,7 @@ char  **argv;
 	}
 	pass2(fin);
 
-	quit(0);
+	quit(estatus);
 }
 
 
@@ -321,6 +320,7 @@ COLOR  clr;
 double	(*ourbright)() = rgb_bright;
 
 
+int
 headline(s)				/* process line from header */
 char  *s;
 {
@@ -339,7 +339,9 @@ char  *s;
 			ourbright = xyz_bright;
 		else
 			wrongformat = !globmatch(PICFMT, fmt);
-	}
+	} else if (isview(s) && sscanview(&ourview, s) > 0)
+		gotview++;
+	return(0);
 }
 
 
@@ -382,11 +384,12 @@ FILE  *in;
 					progname, (int)(100L*i/yres));
 			yres = i;
 			y_r = (double)nrows/yres;
+			estatus++;
 			break;
 		}
 		pass1scan(scan, i);
 	}
-	free((char *)scan);
+	free((void *)scan);
 }
 
 
@@ -401,7 +404,7 @@ FILE  *in;
 	scan2init();
 	yread = 0;
 	for (r = 0; r < nrows; r++) {
-		ycent = (long)r*yres/nrows;
+		ycent = (r+.5)*yres/nrows;
 		while (yread <= ycent+yrad) {
 			if (yread < yres) {
 				if (freadscan(scanin[yread%barsize],
@@ -418,7 +421,7 @@ FILE  *in;
 		if (obarsize > 0)
 			scan2sync(r);
 		for (c = 0; c < ncols; c++) {
-			xcent = (long)c*xres/ncols;
+			xcent = (c+.5)*xres/ncols;
 			if (thresh > FTINY)
 				dothresh(xcent, ycent, c, r);
 			else if (rad > FTINY)
@@ -454,9 +457,9 @@ scan2init()			/* prepare scanline arrays */
 			rad *= (y_r + x_c)/2.0;
 
 		if (thresh > FTINY) {
-			xrad = CHECKRAD*THRESHRAD*rad/x_c + xbrad;
-			yrad = CHECKRAD*THRESHRAD*rad/y_r + ybrad;
 			orad = CHECKRAD*THRESHRAD*rad + 1;
+			xrad = orad/x_c + xbrad;
+			yrad = orad/y_r + ybrad;
 			obarsize = 2*orad + 1;
 		} else {
 			xrad = CHECKRAD*rad/x_c + 1;
@@ -526,10 +529,10 @@ int  r;
 	int  ybot;
 	register int  c;
 					/* average input scanlines */
-	while (nextrow < r+orad && nextrow < nrows) {
-		ybot = (long)nextrow*yres/nrows;
+	while (nextrow <= r+orad && nextrow < nrows) {
+		ybot = (nextrow+.5)*yres/nrows;
 		for (c = 0; c < ncols; c++) {
-			dobox(ctmp, (int)((long)c*xres/ncols),ybot, c,nextrow);
+			dobox(ctmp, (int)((c+.5)*xres/ncols),ybot, c,nextrow);
 			greybar[nextrow%obarsize][c] = (*ourbright)(ctmp);
 		}
 					/* and zero output scanline */
@@ -553,11 +556,12 @@ scan2flush()			/* flush output buffer */
 			break;
 	if (fflush(stdout) < 0) {
 		fprintf(stderr, "%s: write error at end of pass2\n", progname);
-		exit(1);
+		quit(1);
 	}
 }
 
 
+void
 quit(code)		/* remove temporary file and exit */
 int  code;
 {