--- ray/src/px/macbethcal.c	2008/11/10 19:08:19	2.25
+++ ray/src/px/macbethcal.c	2013/05/14 22:45:38	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: macbethcal.c,v 2.25 2008/11/10 19:08:19 greg Exp $";
+static const char	RCSid[] = "$Id: macbethcal.c,v 2.26 2013/05/14 22:45:38 greg Exp $";
 #endif
 /*
  * Calibrate a scanned MacBeth Color Checker Chart
@@ -48,33 +48,33 @@ static const char	RCSid[] = "$Id: macbethcal.c,v 2.25 
 #define	Neutral5	21
 #define	Neutral35	22
 #define	Black		23
-				/* computed from 5nm spectral measurements */
+				/* computed from 10nm spectral measurements */
 				/* CIE 1931 2 degree obs, equal-energy white */
 float	mbxyY[24][3] = {
-		{0.462, 0.3769, 0.0932961},	/* DarkSkin */
-		{0.4108, 0.3542, 0.410348},	/* LightSkin */
-		{0.2626, 0.267, 0.181554},	/* BlueSky */
-		{0.36, 0.4689, 0.108447},	/* Foliage */
-		{0.2977, 0.2602, 0.248407},	/* BlueFlower */
-		{0.2719, 0.3485, 0.401156},	/* BluishGreen */
-		{0.52, 0.4197, 0.357899},	/* Orange */
-		{0.229, 0.1866, 0.103911},	/* PurplishBlue */
-		{0.4909, 0.3262, 0.242615},	/* ModerateRed */
-		{0.3361, 0.2249, 0.0600102},	/* Purple */
-		{0.3855, 0.4874, 0.42963},	/* YellowGreen */
-		{0.4853, 0.4457, 0.476343},	/* OrangeYellow */
-		{0.2026, 0.1369, 0.0529249},	/* Blue */
-		{0.3007, 0.4822, 0.221226},	/* Green */
-		{0.5805, 0.3238, 0.162167},	/* Red */
-		{0.4617, 0.472, 0.64909},	/* Yellow */
-		{0.4178, 0.2625, 0.233662},	/* Magenta */
-		{0.2038, 0.2508, 0.167275},	/* Cyan */
-		{0.3358, 0.337, 0.916877},	/* White */
-		{0.3338, 0.3348, 0.604678},	/* Neutral.8 */
-		{0.3333, 0.3349, 0.364566},	/* Neutral.65 */
-		{0.3353, 0.3359, 0.200238},	/* Neutral.5 */
-		{0.3363, 0.336, 0.0878721},	/* Neutral.35 */
-		{0.3346, 0.3349, 0.0308383}	/* Black */
+		{0.421236, 0.361196, 0.103392},		/* DarkSkin */
+		{0.40868, 0.358157, 0.352867},		/* LightSkin */
+		{0.265063, 0.271424, 0.185124},		/* BlueSky */
+		{0.362851, 0.43055, 0.132625},		/* Foliage */
+		{0.28888, 0.260851, 0.233138},		/* BlueFlower */
+		{0.277642, 0.365326, 0.416443},		/* BluishGreen */
+		{0.524965, 0.40068, 0.312039},		/* Orange */
+		{0.225018, 0.190392, 0.114999},		/* PurplishBlue */
+		{0.487199, 0.315372, 0.198616},		/* ModerateRed */
+		{0.314245, 0.227231, 0.0646047},	/* Purple */
+		{0.396202, 0.489732, 0.440724},		/* YellowGreen */
+		{0.493297, 0.435299, 0.43444},		/* OrangeYellow */
+		{0.198191, 0.149265, 0.0588122},	/* Blue */
+		{0.322838, 0.487601, 0.229258},		/* Green */
+		{0.561833, 0.321165, 0.126978},		/* Red */
+		{0.468113, 0.467021, 0.605289},		/* Yellow */
+		{0.397128, 0.248535, 0.201761},		/* Magenta */
+		{0.209552, 0.276256, 0.190917},		/* Cyan */
+		{0.337219, 0.339042, 0.912482},		/* White */
+		{0.333283, 0.335077, 0.588297},		/* Neutral.8 */
+		{0.332747, 0.334371, 0.3594},		/* Neutral.65 */
+		{0.331925, 0.334202, 0.19114},		/* Neutral.5 */
+		{0.330408, 0.332615, 0.0892964},	/* Neutral.35 */
+		{0.331841, 0.331405, 0.0319541},	/* Black */
 	};
 
 COLOR	mbRGB[24];		/* MacBeth RGB values */