--- ray/src/hd/rhcopy.c	2003/02/22 02:07:24	3.15
+++ ray/src/hd/rhcopy.c	2003/07/27 22:12:02	3.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhcopy.c,v 3.15 2003/02/22 02:07:24 greg Exp $";
+static const char	RCSid[] = "$Id: rhcopy.c,v 3.19 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Copy data into a holodeck file
@@ -91,9 +91,9 @@ int	*hf;
 	if (!strncmp(s, "OBSTRUCTIONS=", 13)) {
 		s += 13;
 		while (*s == ' ') s++;
-		if (*s == 't' | *s == 'T')
+		if ((*s == 't') | (*s == 'T'))
 			*hf |= H_OBST;
-		else if (*s == 'f' | *s == 'F')
+		else if ((*s == 'f') | (*s == 'F'))
 			*hf |= H_OBSF;
 		else
 			error(WARNING, "bad OBSTRUCTIONS value in holodeck");
@@ -107,7 +107,6 @@ openholo(fname, append)		/* open existing holodeck fil
 char	*fname;
 int	append;
 {
-	extern long	ftell();
 	FILE	*fp;
 	int	fd;
 	int	hflags = 0;
@@ -195,7 +194,7 @@ static int
 bpcmp(b1p, b2p)			/* compare beam positions on disk */
 int	*b1p, *b2p;
 {
-	register long	pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
+	register off_t	pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
 
 	if (pdif > 0L) return(1);
 	if (pdif < 0L) return(-1);
@@ -299,7 +298,7 @@ char	*pcf, *zbf;
 	int	eshft;
 	double	emult;
 	RESOLU	prs;
-	FLOAT	vl[2];
+	RREAL	vl[2];
 	FVECT	ro, rd;
 	double	aftd;
 	COLOR	ctmp;
@@ -315,7 +314,7 @@ char	*pcf, *zbf;
 		error(SYSTEM, pcf);
 	}
 				/* load picture header */
-	copystruct(&phd.vw, &stdview);
+	phd.vw = stdview;
 	phd.expos = 1.0;
 	phd.badfmt = phd.gotview = phd.altprims = 0;
 	if (getheader(pfp, picheadline, (char *)&phd) < 0 ||
@@ -334,11 +333,11 @@ char	*pcf, *zbf;
 		error(WARNING, errmsg);
 	}
 				/* figure out what to do about exposure */
-	if (phd.expos < 0.99 | phd.expos > 1.01) {
+	if ((phd.expos < 0.99) | (phd.expos > 1.01)) {
 		emult = -log(phd.expos)/log(2.);
 		eshft = emult >= 0. ? emult+.5 : emult-.5;
 		emult -= (double)eshft;
-		if (emult <= 0.01 & emult >= -0.01)
+		if ((emult <= 0.01) & (emult >= -0.01))
 			emult = -1.;
 		else {
 			emult = 1./phd.expos;
@@ -351,7 +350,7 @@ char	*pcf, *zbf;
 				/* allocate buffers */
 	cscn = (COLR *)malloc(scanlen(&prs)*sizeof(COLR));
 	zscn = (float *)malloc(scanlen(&prs)*sizeof(float));
-	if (cscn == NULL | zscn == NULL)
+	if ((cscn == NULL) | (zscn == NULL))
 		error(SYSTEM, "out of memory in addpicz");
 				/* read and process each scanline */
 	for (j = 0; j < numscans(&prs); j++) {