--- ray/src/util/vwrays.c	2003/07/03 22:41:45	3.6
+++ ray/src/util/vwrays.c	2003/10/22 02:06:35	3.9
@@ -1,14 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: vwrays.c,v 3.6 2003/07/03 22:41:45 schorsch Exp $";
+static const char	RCSid[] = "$Id: vwrays.c,v 3.9 2003/10/22 02:06:35 greg Exp $";
 #endif
 /*
  * Compute rays corresponding to a given picture or view.
  */
 
-
-#include "standard.h"
-
 #include "platform.h"
+#include "standard.h"
 #include "view.h"
 
 extern int	putf(), putd(), puta();
@@ -100,7 +98,7 @@ char	*argv[];
 		default:
 			goto userr;
 		}
-	if (i > argc | i+2 < argc)
+	if ((i > argc) | (i+2 < argc))
 		goto userr;
 	if (i < argc) {
 		rval = viewfile(argv[i], &vw, &rs);
@@ -162,10 +160,10 @@ pix2rays(FILE *fp)
 		if (zfd >= 0) {
 			loc2pix(pp, &rs, px/rs.xr, py/rs.yr);
 			if (lseek(zfd,
-				(pp[1]*scanlen(&rs)+pp[0])*sizeof(float), 0)
-					< 0 ||
+				(pp[1]*scanlen(&rs)+pp[0])*sizeof(float),
+						SEEK_SET) < 0 ||
 					read(zfd, &zval, sizeof(float))
-					< sizeof(float)) {
+						< sizeof(float)) {
 				fprintf(stderr, "%s: depth buffer read error\n",
 						progname);
 				exit(1);