--- ray/src/rt/rpict.c	2003/02/22 02:07:29	2.52
+++ ray/src/rt/rpict.c	2003/06/05 19:29:34	2.55
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rpict.c,v 2.52 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id";
 #endif
 /*
  *  rpict.c - routines and variables for picture generation.
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  "ray.h"
 
@@ -76,16 +21,15 @@ static const char	RCSid[] = "$Id: rpict.c,v 2.52 2003/
 #endif
 #endif
 
-extern time_t	time();
-
+#include  <time.h>
 #include  <signal.h>
 
+#include  "platform.h"
 #include  "view.h"
-
 #include  "random.h"
-
 #include  "paths.h"
 
+
 #define	 RFTEMPLATE	"rfXXXXXX"
 
 #ifndef SIGCONT
@@ -163,7 +107,7 @@ int  hres, vres;			/* resolution for this frame */
 
 static VIEW	lastview;		/* the previous view input */
 
-extern char  *mktemp();
+extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
 
 void  report();
 
@@ -268,7 +212,6 @@ char  *pout, *zout, *prvr;
  * sequenced file naming.
  */
 {
-	extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
 	char  fbuf[128], fbuf2[128];
 	int  npicts;
 	register char  *cp;
@@ -345,9 +288,7 @@ char  *pout, *zout, *prvr;
 					"cannot open output file \"%s\"", fbuf);
 				error(SYSTEM, errmsg);
 			}
-#ifdef MSDOS
-			setmode(fileno(stdout), O_BINARY);
-#endif
+			SET_FILE_BINARY(stdout);
 			dupheader();
 		}
 		hres = hresolu; vres = vresolu; pa = pixaspect;
@@ -449,9 +390,7 @@ char  *zfile, *oldfile;
 			sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
 			error(SYSTEM, errmsg);
 		}
-#ifdef MSDOS
-		setmode(zfd, O_BINARY);
-#endif
+		SET_FD_BINARY(zfd);
 		for (i = 0; i <= psample; i++) {
 			zbar[i] = (float *)malloc(hres*sizeof(float));
 			if (zbar[i] == NULL)
@@ -733,9 +672,7 @@ char  *oldfile;
 		error(WARNING, errmsg);
 		goto gotzip;
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 				/* discard header */
 	getheader(fp, NULL, NULL);
 				/* get picture size */