--- ray/src/common/image.c	1999/02/26 12:24:07	2.15
+++ ray/src/common/image.c	2003/02/22 02:07:22	2.16
@@ -1,19 +1,73 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: image.c,v 2.16 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  image.c - routines for image generation.
+ *
+ *  External symbols declared in view.h
  */
 
+/* ====================================================================
+ * 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  "standard.h"
 
 #include  "view.h"
 
-#include  "resolu.h"
-
 #include  "paths.h"
 
 #define  FEQ(x,y)	(fabs((x)-(y)) <= FTINY)
@@ -108,6 +162,7 @@ register VIEW  *v;
 }
 
 
+void
 normaspect(va, ap, xp, yp)		/* fix pixel aspect or resolution */
 double  va;			/* view aspect ratio */
 double  *ap;			/* pixel aspect in (or out if 0) */
@@ -199,6 +254,7 @@ double  x, y;
 }
 
 
+void
 viewloc(ip, v, p)		/* find image location for point */
 FVECT  ip;
 register VIEW  *v;
@@ -268,6 +324,7 @@ FVECT  p;
 }
 
 
+void
 pix2loc(loc, rp, px, py)	/* compute image location from pixel pos. */
 FLOAT  loc[2];
 register RESOLU  *rp;
@@ -275,22 +332,23 @@ int  px, py;
 {
 	register int  x, y;
 
-	if (rp->or & YMAJOR) {
+	if (rp->rt & YMAJOR) {
 		x = px;
 		y = py;
 	} else {
 		x = py;
 		y = px;
 	}
-	if (rp->or & XDECR)
+	if (rp->rt & XDECR)
 		x = rp->xr-1 - x;
-	if (rp->or & YDECR)
+	if (rp->rt & YDECR)
 		y = rp->yr-1 - y;
 	loc[0] = (x+.5)/rp->xr;
 	loc[1] = (y+.5)/rp->yr;
 }
 
 
+void
 loc2pix(pp, rp, lx, ly)		/* compute pixel pos. from image location */
 int  pp[2];
 register RESOLU  *rp;
@@ -300,11 +358,11 @@ double  lx, ly;
 
 	x = lx * rp->xr;
 	y = ly * rp->yr;
-	if (rp->or & XDECR)
+	if (rp->rt & XDECR)
 		x = rp->xr-1 - x;
-	if (rp->or & YDECR)
+	if (rp->rt & YDECR)
 		y = rp->yr-1 - y;
-	if (rp->or & YMAJOR) {
+	if (rp->rt & YMAJOR) {
 		pp[0] = x;
 		pp[1] = y;
 	} else {
@@ -413,6 +471,7 @@ register char  *s;
 }
 
 
+void
 fprintview(vp, fp)			/* write out view parameters */
 register VIEW  *vp;
 FILE  *fp;
@@ -536,13 +595,15 @@ RESOLU  *rp;
 	struct myview	mvs;
 	FILE  *fp;
 
-	if ((fp = fopen(fname, "r")) == NULL)
+	if (fname == NULL || !strcmp(fname, "-"))
+		fp = stdin;
+	else if ((fp = fopen(fname, "r")) == NULL)
 		return(-1);
 
 	mvs.hv = vp;
 	mvs.ok = 0;
 
-	getheader(fp, gethview, &mvs);
+	getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
 
 	if (rp != NULL && !fgetsresolu(rp, fp))
 		mvs.ok = 0;