--- ray/src/common/lamps.c	1990/12/08 09:28:16	1.1
+++ ray/src/common/lamps.c	2003/06/08 12:03:09	2.9
@@ -1,19 +1,22 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: lamps.c,v 2.9 2003/06/08 12:03:09 schorsch Exp $";
 #endif
-
 /*
  * Load lamp data.
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
+#include  <stdlib.h>
 #include  <ctype.h>
 
-extern char	*eindex(), *expsave(), *malloc();
-extern FILE	*fropen();
+#include  "standard.h"
+#include  "color.h"
 
+extern char	*eindex(), *expsave();
+extern FILE	*frlibopen();
+
 typedef struct lamp {
 	char	*pattern;			/* search pattern */
 	float	*color;				/* pointer to lamp value */
@@ -24,8 +27,9 @@ static LAMP	*lamps = NULL;		/* lamp list */
 
 
 float *
-matchlamp(s)				/* see if string matches any lamp */
-char	*s;
+matchlamp(				/* see if string matches any lamp */
+char	*s
+)
 {
 	register LAMP	*lp;
 
@@ -38,8 +42,10 @@ char	*s;
 }
 
 
-loadlamps(file)					/* load lamp type file */
-char	*file;
+int
+loadlamps(					/* load lamp type file */
+char	*file
+)
 {
 	LAMP	*lastp;
 	register LAMP	*lp;
@@ -48,7 +54,7 @@ char	*file;
 	char	buf[128], str[128];
 	register char	*cp1, *cp2;
 
-	if ((fp = fropen(file)) == NULL)
+	if ((fp = frlibopen(file)) == NULL)
 		return(0);
 	lastp = NULL;
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
@@ -92,17 +98,17 @@ char	*file;
 				goto fmterr;
 			}
 		} else {			/* or read specificaion */
-			if ((lp->color=(float *)malloc(3*sizeof(float)))==NULL)
+			if ((lp->color=(float *)malloc(6*sizeof(float)))==NULL)
 				goto memerr;
-			if (sscanf(cp1, "%f %f %f", &lp->color[0], &
-					lp->color[1], &lp->color[2]) != 3) {
+			if (sscanf(cp1, "%f %f %f", &lp->color[3], &
+					lp->color[4], &lp->color[5]) != 3) {
 				cp1 = "bad lamp data";
 				goto fmterr;
 			}
 						/* convert xyY to XYZ */
-			xyz[1] = lp->color[2];
-			xyz[0] = lp->color[0]/lp->color[1] * xyz[1];
-			xyz[2] = xyz[1]*(1./lp->color[1] - 1.) - xyz[0];
+			xyz[1] = lp->color[5];
+			xyz[0] = lp->color[3]/lp->color[4] * xyz[1];
+			xyz[2] = xyz[1]*(1./lp->color[4] - 1.) - xyz[0];
 						/* XYZ to RGB */
 			cie_rgb(lp->color, xyz);
 		}
@@ -114,7 +120,7 @@ char	*file;
 		lastp = lp;
 	}
 	fclose(fp);
-	return(1);
+	return(lastp != NULL);
 memerr:
 	fputs("Out of memory in loadlamps\n", stderr);
 	return(-1);
@@ -122,4 +128,24 @@ fmterr:
 	fputs(buf, stderr);
 	fprintf(stderr, "%s: %s\n", file, cp1);
 	return(-1);
+}
+
+
+void
+freelamps(void)			/* free our lamps list */
+{
+	register LAMP	*lp1, *lp2;
+	
+	for (lp1 = lamps; lp1 != NULL; lp1 = lp2) {
+		free(lp1->pattern);
+		if (lp1->color != NULL) {
+			for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next)
+				if (lp2->color == lp1->color)
+					lp2->color = NULL;
+			free((void *)lp1->color);
+		}
+		lp2 = lp1->next;
+		free((void *)lp1);
+	}
+	lamps = NULL;
 }