--- ray/src/px/aedimage.c	1991/03/18 09:35:01	1.9
+++ ray/src/px/aedimage.c	2003/02/22 02:07:27	2.5
@@ -1,9 +1,6 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: aedimage.c,v 2.5 2003/02/22 02:07:27 greg Exp $";
 #endif
-
 /*
  *  aedimage.c - RADIANCE driver for AED 512 terminal.
  *
@@ -13,6 +10,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#include  <math.h>
+
 #include  <signal.h>
 
 #include  <sys/ioctl.h>
@@ -97,8 +96,8 @@ FILE  *fin;
 extern long  ftell();
 long  scanpos[NROWS];
 
-extern double  atof();
 double  exposure = 1.0;
+int  wrong_fmt = 0;
 
 
 main(argc, argv)
@@ -140,9 +139,11 @@ char  *argv[];
 		quitmsg(errmsg);
 	}
 				/* get header */
-	getheader(fin, checkhead);
+	getheader(fin, checkhead, NULL);
+	if (wrong_fmt)
+		quitmsg("input must be a Radiance picture");
 				/* get picture dimensions */
-	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
+	if (fgetresolu(&xmax, &ymax, fin) < 0)
 		quitmsg("bad picture size");
 	if (xmax > NCOLS || ymax > NROWS)
 		quitmsg("resolution mismatch");
@@ -166,11 +167,19 @@ userr:
 }
 
 
+int
 checkhead(line)				/* deal with line from header */
 char  *line;
 {
+	char	fmt[32];
+
 	if (isexpos(line))
 		exposure *= exposval(line);
+	else if (isformat(line)) {
+		formatval(fmt, line);
+		wrong_fmt = strcmp(fmt, COLRFMT);
+	}
+	return(0);
 }
 
 
@@ -235,6 +244,7 @@ char  *err;
 }
 
 
+void
 eputs(s)
 char  *s;
 {
@@ -242,6 +252,7 @@ char  *s;
 }
 
 
+void
 quit(status)
 int  status;
 {
@@ -511,7 +522,6 @@ int  offset[3];
 picreadcm(map)			/* do gamma correction */
 colormap  map;
 {
-	extern double  pow();
 	register int  i, val;
 
 	for (i = 0; i < 256; i++) {