--- ray/src/px/pcomb.c	2003/06/05 19:29:34	2.23
+++ ray/src/px/pcomb.c	2003/07/21 22:30:18	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcomb.c,v 2.23 2003/06/05 19:29:34 schorsch Exp $";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.26 2003/07/21 22:30:18 schorsch Exp $";
 #endif
 /*
  *  Combine picture files according to calcomp functions.
@@ -8,6 +8,7 @@ static const char	RCSid[] = "$Id: pcomb.c,v 2.23 2003/
  */
 
 #include "standard.h"
+#include "platform.h"
 #include "color.h"
 #include "calcomp.h"
 #include "view.h"
@@ -108,7 +109,7 @@ char	*argv[];
 	for (nfiles = 0; nfiles < MAXINP; nfiles++) {
 		setcolor(input[nfiles].coef, 1.0, 1.0, 1.0);
 		setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
-		copystruct(&input[nfiles].vw, &stdview);
+		input[nfiles].vw = stdview;
 		input[nfiles].pa = 1.0;
 	}
 	nfiles = 0;
@@ -517,7 +518,7 @@ register char	*nam;
 	static unsigned long	ltick[MAXINP];
 	static FVECT	lorg[MAXINP], ldir[MAXINP];
 	static double	ldist[MAXINP];
-	FLOAT	loc[2];
+	RREAL	loc[2];
 	int	fn;
 	register int	i;
 
@@ -555,7 +556,7 @@ l_psize()			/* compute pixel size in steradians */
 	static unsigned long	ltick[MAXINP];
 	static double	psize[MAXINP];
 	FVECT	dir0, org, dirx, diry;
-	FLOAT	locx[2], locy[2];
+	RREAL	locx[2], locy[2];
 	double	d;
 	int	fn;
 	register int	i;