--- ray/src/rt/lookamb.c	1991/06/07 14:24:34	1.5
+++ ray/src/rt/lookamb.c	2003/02/22 02:07:28	2.7
@@ -1,30 +1,81 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: lookamb.c,v 2.7 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  lookamb.c - program to examine ambient components.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     10/8/86
+ * 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  <stdio.h>
+#include  "ray.h"
 
-#include  "color.h"
-
 #include  "ambient.h"
 
 
 int  dataonly = 0;
-
+int  header = 1;
 int  reverse = 0;
 
 AMBVAL  av;
 
 
 main(argc, argv)		/* load ambient values from a file */
+int  argc;
 char  *argv[];
 {
 	FILE  *fp;
@@ -39,6 +90,9 @@ char  *argv[];
 			case 'r':
 				reverse = 1;
 				break;
+			case 'h':
+				header = 0;
+				break;
 			default:
 				fprintf(stderr, "%s: unknown option '%s'\n",
 						argv[0], argv[i]);
@@ -53,19 +107,48 @@ char  *argv[];
 		fprintf(stderr, "%s: file not found\n", argv[i]);
 		return(1);
 	}
-	if (reverse)
+	if (reverse) {
+		if (header) {
+			if (checkheader(fp, "ascii", stdout) < 0)
+				goto formaterr;
+		} else {
+			newheader("RADIANCE", stdout);
+			printargs(argc, argv, stdout);
+		}
+		fputformat(AMBFMT, stdout);
+		putchar('\n');
+#ifdef MSDOS
+		setmode(fileno(stdout), O_BINARY);
+#endif
+		putambmagic(stdout);
 		writamb(fp);
-	else
+	} else {
+#ifdef MSDOS
+		setmode(fileno(fp), O_BINARY);
+#endif
+		if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
+			goto formaterr;
+		if (!hasambmagic(fp))
+			goto formaterr;
+		if (header) {
+			fputformat("ascii", stdout);
+			putchar('\n');
+		}
 		lookamb(fp);
+	}
 	fclose(fp);
 	return(0);
+formaterr:
+	fprintf(stderr, "%s: format error on input\n", argv[0]);
+	exit(1);
 }
 
 
+void
 lookamb(fp)			/* get ambient values from a file */
 FILE  *fp;
 {
-	while (fread((char *)&av, sizeof(AMBVAL), 1, fp) == 1) {
+	while (readambval(&av, fp)) {
 		if (dataonly) {
 			printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]);
 			printf("%f\t%f\t%f\t", av.dir[0], av.dir[1], av.dir[2]);
@@ -97,6 +180,7 @@ FILE  *fp;
 }
 
 
+void
 writamb(fp)			/* write binary ambient values */
 FILE  *fp;
 {
@@ -132,7 +216,7 @@ FILE  *fp;
 				&av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3)
 			return;
 		av.next = NULL;
-		fwrite((char *)&av, sizeof(AMBVAL), 1, stdout);
+		writambval(&av, stdout);
 		if (ferror(stdout))
 			exit(1);
 	}