--- ray/src/px/pfilt.c	1991/06/05 12:15:30	1.17
+++ ray/src/px/pfilt.c	1992/09/21 12:14:17	2.4
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -12,45 +12,52 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
 #include  <signal.h>
 
 #include  "color.h"
 
+#include  "resolu.h"
+
+#include  "paths.h"
+
 extern char  *malloc();
 extern float  *matchlamp();
 
-#define  FEQ(a,b)	((a) >= .98*(b) && (a) <= 1.02*(b))
+#define	 FEQ(a,b)	((a) >= .98*(b) && (a) <= 1.02*(b))
 
-#define  CHECKRAD	1.5	/* radius to check for filtering */
+#define	 CHECKRAD	1.5	/* radius to check for filtering */
 
 COLOR  exposure = WHTCOLOR;	/* exposure for the frame */
 
-double  rad = 0.0;		/* output pixel radius for filtering */
+double	rad = 0.0;		/* output pixel radius for filtering */
 
 int  nrows = 0;			/* number of rows for output */
 int  ncols = 0;			/* number of columns for output */
 
-double  x_c = 1.0;		/* ratio of output x size to input */
-double  y_r = 1.0;		/* ratio of output y size to input */
+double	x_c = 1.0;		/* ratio of output x size to input */
+double	y_r = 1.0;		/* ratio of output y size to input */
 
 int  singlepass = 0;		/* true means skip first pass */
 
 int  avghot = 0;		/* true means average in bright spots */
 
-double  hotlvl = 1000.0;	/* level considered "hot" */
+double	hotlvl = 1000.0;	/* level considered "hot" */
 
 int  npts = 0;			/* (half) number of points for stars */
 
-double  spread = 1e-4;		/* spread for star points */
+double	spread = 1e-4;		/* spread for star points */
 
-#define  TEMPLATE	"/usr/tmp/pfXXXXXX"
-
 char  *tfname = NULL;
 
 char  *lampdat = "lamp.tab";	/* lamp data file */
 
+int  order;			/* scanline ordering of input */
 int  xres, yres;		/* resolution of input */
-double  inpaspect = 1.0;	/* pixel aspect ratio of input */
+double	inpaspect = 1.0;	/* pixel aspect ratio of input */
 int  correctaspect = 0;		/* aspect ratio correction? */
 
 int  wrongformat = 0;
@@ -69,25 +76,29 @@ main(argc, argv)
 int  argc;
 char  **argv;
 {
-	extern char  *mktemp();
-	extern double  atof(), pow();
+	extern double  pow();
 	extern long  ftell();
 	extern int  quit(), headline();
 	FILE  *fin;
 	float  *lampcolor;
 	char  *lamptype = NULL;
 	long  fpos;
-	double  outaspect = 0.0;
-	double  d;
-	int  i;
-
+	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
 	if (signal(SIGINT, quit) == SIG_IGN)
 		signal(SIGINT, SIG_IGN);
 	if (signal(SIGHUP, quit) == SIG_IGN)
 		signal(SIGINT, SIG_IGN);
 	signal(SIGTERM, quit);
 	signal(SIGPIPE, quit);
-#ifdef  SIGXCPU
+#ifdef	SIGXCPU
 	signal(SIGXCPU, quit);
 	signal(SIGXFSZ, quit);
 #endif
@@ -196,9 +207,9 @@ char  **argv;
 			fprintf(stderr, "%s: unknown lamp type\n", lamptype);
 			quit(1);
 		}
-		colval(exposure,RED) /= lampcolor[0];
-		colval(exposure,GRN) /= lampcolor[1];
-		colval(exposure,BLU) /= lampcolor[2];
+		for (i = 0; i < 3; i++)
+			if (lampcolor[i] > 1e-4)
+				colval(exposure,i) /= lampcolor[i];
 		freelamps();
 	}
 					/* open input file */
@@ -238,10 +249,12 @@ char  **argv;
 					/* add new header info. */
 	printargs(i, argv, stdout);
 					/* get picture size */
-	if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) {
+	if ((order = fgetresolu(&xres, &yres, fin)) < 0) {
 		fprintf(stderr, "%s: bad picture size\n", progname);
 		quit(1);
 	}
+	if (!(order & YMAJOR))
+		inpaspect = 1.0/inpaspect;
 					/* compute output resolution */
 	if (ncols <= 0)
 		ncols = x_c*xres + .5;
@@ -345,7 +358,7 @@ FILE  *in;
 	int  yread;
 	int  ycent, xcent;
 	int  r, c;
- 	
+	
 	pass2init();
 	scan2init();
 	yread = 0;
@@ -388,7 +401,7 @@ FILE  *in;
 scan2init()			/* prepare scanline arrays */
 {
 	COLOR	ctmp;
-	double  d;
+	double	d;
 	register int  i;
 
 	if (rad <= 0.0) {
@@ -419,7 +432,7 @@ scan2init()			/* prepare scanline arrays */
 	}
 					/* record pixel aspect ratio */
 	if (!correctaspect) {
-		d = x_c / y_r;
+		d = order & YMAJOR ? x_c/y_r : y_r/x_c ;
 		if (!FEQ(d,1.0))
 			fputaspect(d, stdout);
 	}
@@ -435,7 +448,7 @@ scan2init()			/* prepare scanline arrays */
 		fputcolcor(ctmp, stdout);
 	printf("\n");
 					/* write out resolution */
-	fputresolu(YMAJOR|YDECR, ncols, nrows, stdout);
+	fputresolu(order, ncols, nrows, stdout);
 }