--- ray/src/px/pcond.c	2003/02/22 02:07:27	3.14
+++ ray/src/px/pcond.c	2003/07/21 22:30:18	3.16
@@ -1,11 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcond.c,v 3.14 2003/02/22 02:07:27 greg Exp $";
+static const char	RCSid[] = "$Id: pcond.c,v 3.16 2003/07/21 22:30:18 schorsch Exp $";
 #endif
 /*
  * Condition Radiance picture for display/output
  *  Added white-balance adjustment 10/01 (GW).
  */
 
+#include "platform.h"
 #include "pcond.h"
 
 
@@ -162,10 +163,8 @@ char	*argv[];
 					/* open output file */
 	if (i+2 == argc && freopen(argv[i+1], "w", stdout) == NULL)
 		syserror(argv[i+1]);
-#ifdef MSDOS
-	setmode(fileno(infp), O_BINARY);
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_FILE_BINARY(infp);
+	SET_FILE_BINARY(stdout);
 	getahead();			/* load input header */
 	printargs(argc, argv, stdout);	/* add to output header */
 	if (mbcalfile == NULL & outprims != stdprims)
@@ -244,7 +243,7 @@ getahead()			/* load picture header */
 		exit(1);
 	}
 	if (!gotview || ourview.type == VT_PAR) {
-		copystruct(&ourview, &stdview);
+		ourview = stdview;
 		ourview.type = VT_PER;
 		if (pixaspect*inpres.yr < inpres.xr) {
 			ourview.horiz = 40.0;