--- ray/src/cv/lampcolor.c	1991/11/12 17:02:10	2.1
+++ ray/src/cv/lampcolor.c	2003/02/22 02:07:23	2.6
@@ -1,21 +1,19 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: lampcolor.c,v 2.6 2003/02/22 02:07:23 greg Exp $";
 #endif
-
 /*
  * Program to convert lamp color from table and compute radiance.
  */
 
 #include <stdio.h>
 
+#include <math.h>
+
 #include "color.h"
 
 #define PI	3.14159265358979323846
 
 extern char	*gets(), *strcpy();
-extern double	atof();
 extern float	*matchlamp();
 
 				/* lamp parameters */
@@ -38,9 +36,9 @@ struct {
 	int	(*check)();
 	char	*help;
 } param[NPARAMS] = {
-	{ "lamp type", "white", typecheck,
+	{ "lamp type", "WHITE", typecheck,
 "The lamp type is a string which corresponds to one of the types registered\n\
-in the lamp table file.  A value of \"white\" means an uncolored source,\n\
+in the lamp table file.  A value of \"WHITE\" means an uncolored source,\n\
 which may be preferable because it results in a color balanced image." },
 	{ "length unit", "meter", unitcheck,
 "Unit must be one of:  \"meter\", \"centimeter\", \"foot\", or \"inch\".\n\