--- ray/src/hd/rhcopy.c	1998/11/12 15:06:00	3.11
+++ ray/src/hd/rhcopy.c	1999/03/08 17:32:26	3.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
+/* Copyright (c) 1999 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -16,8 +16,8 @@ static char SCCSid[] = "$SunId$ SGI";
 #define BKBSIZE		256		/* beam clump size (kilobytes) */
 #endif
 
-int	checkdepth = 1;		/* check depth (!-f option)? */
-int	checkrepeats = 0;	/* check for repeats (-c option)? */
+int	checkdepth = 1;		/* check depth (!-d option)? */
+int	checkrepeats = 0;	/* check for repeats (-u option)? */
 int	frompicz;		/* input from pictures & depth-buffers? */
 int	noutsects;		/* number of output sections */
 char	obstr, unobstr;		/* flag pointer values */
@@ -175,7 +175,7 @@ COLR	cv;
 		bi = hdbindex(hp, gc);		/* check for duplicates */
 		if (checkrepeats && (bp = hdgetbeam(hp, bi)) != NULL) {
 			for (n = bp->nrm, rv = hdbray(bp); n--; rv++)
-				if (rv->d == dc &&
+				if ((hp->priv != NULL || rv->d == dc) &&
 						rv->r[0][0] == rr[0][0] &&
 						rv->r[0][1] == rr[0][1] &&
 						rv->r[1][0] == rr[1][0] &&
@@ -236,7 +236,6 @@ int	*bq, nb;
 		}
 		hdfreebeam(hp, bq[i]);		/* free the beam */
 	}
-	hdflush(NULL);			/* write & free clump */
 	return(0);
 }
 
@@ -253,6 +252,7 @@ char	*hdf;
 		hddone(hdlist[noutsects]);		/* free the section */
 	}
 	close(fd);			/* close input file */
+	hdflush(NULL);			/* flush output */
 }