--- ray/src/cv/lampcolor.c	1991/10/22 09:38:17	1.7
+++ ray/src/cv/lampcolor.c	1991/12/19 15:06:15	2.2
@@ -10,10 +10,14 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include <stdio.h>
 
+#include "color.h"
+
 #define PI	3.14159265358979323846
 
 extern char	*gets(), *strcpy();
+#ifndef atof
 extern double	atof();
+#endif
 extern float	*matchlamp();
 
 				/* lamp parameters */
@@ -173,7 +177,7 @@ compute()			/* compute lamp radiance */
 {
 	double	whiteval;
 
-	whiteval = lumens/470./PI/area;
+	whiteval = lumens/area/(WHTEFFICACY*PI);
 
 	printf("Lamp color (RGB) = %f %f %f\n",
 			lampcolor[0]*whiteval,
@@ -205,11 +209,11 @@ again:
 
 getpolygon()			/* get projected area for a polygon */
 {
-	static double	area = 1.0;
+	static double	parea = 1.0;
 
-	getd("Polygon area", &area,
+	getd("Polygon area", &parea,
 		"Enter the total radiating area of the polygon.");
-	area = unit2meter*unit2meter * area;
+	area = unit2meter*unit2meter * parea;
 	return(1);
 }