--- ray/src/cv/mgflib/parser.h	1994/09/02 16:04:16	1.16
+++ ray/src/cv/mgflib/parser.h	1995/02/24 16:50:05	1.17
@@ -90,7 +90,7 @@ extern char	*mg_err[MG_NERRS];
  * returns 0 when the end of file has been reached.
  */
 
-#define MG_MAXLINE	512		/* maximum input line length */
+#define MG_MAXLINE	4096		/* maximum input line length */
 #define MG_MAXARGC	(MG_MAXLINE/4)	/* maximum argument count */
 
 typedef struct mg_fctxt {
@@ -205,9 +205,9 @@ extern double	normalize(FVECT);	/* normalize a vector 
 
 typedef struct {
 	int	clock;			/* incremented each change */
-	short	flags;			/* what's been set */
-	short	ssamp[C_CNSS];		/* spectral samples, min wl to max */
-	long	ssum;			/* straight sum of spectral values */
+	unsigned short	flags;		/* what's been set */
+	unsigned short	ssamp[C_CNSS];	/* spectral samples, min wl to max */
+	unsigned long	ssum;		/* straight sum of spectral values */
 	float	cx, cy;			/* xy chromaticity value */
 	float	eff;			/* efficacy (lumens/watt) */
 } C_COLOR;
@@ -226,19 +226,19 @@ typedef struct {
 			{14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
 			320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
 			10622,10026,8544,6424,4479,2835,1649,874,468,227,\
-			114,58,29,14,7,3,2,1,0}, 106836L, .735, .265, 362.230 }
+			114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
 
 #define C_CIEY		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
 			{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
 			5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
 			5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
-			5,2,1,1,0,0}, 106856L, .274, .717, 493.525 }
+			5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
 
 #define C_CIEZ		{ 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
 			{65,201,679,2074,6456,13856,17471,17721,16692,\
 			12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
 			11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
-			106770L, .167, .009, 54.363 }
+			106770L, .147, .077, 54.363 }
 
 #define c_cval(c,l)	((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)