--- ray/src/px/macbethcal.c	1995/10/11 10:40:13	2.1
+++ ray/src/px/macbethcal.c	1997/01/30 19:14:11	2.12
@@ -1,4 +1,4 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1997 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -18,8 +18,33 @@ static char SCCSid[] = "$SunId$ LBL";
 #include "resolu.h"
 #include "pmap.h"
 
-				/* MacBeth colors (CIE 1931, absolute white) */
-				/* computed from spectral measurements */
+				/* MacBeth colors */
+#define	DarkSkin	0
+#define	LightSkin	1
+#define	BlueSky		2
+#define	Foliage		3
+#define	BlueFlower	4
+#define	BluishGreen	5
+#define	Orange		6
+#define	PurplishBlue	7
+#define	ModerateRed	8
+#define	Purple		9
+#define	YellowGreen	10
+#define	OrangeYellow	11
+#define	Blue		12
+#define	Green		13
+#define	Red		14
+#define	Yellow		15
+#define	Magenta		16
+#define	Cyan		17
+#define	White		18
+#define	Neutral8	19
+#define	Neutral65	20
+#define	Neutral5	21
+#define	Neutral35	22
+#define	Black		23
+				/* computed from 5nm 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 */
@@ -50,22 +75,40 @@ float	mbxyY[24][3] = {
 COLOR	mbRGB[24];		/* MacBeth RGB values */
 
 #define	NMBNEU		6	/* Number of MacBeth neutral colors */
-short	mbneu[NMBNEU] = {23,22,21,20,19,18};
-#define NMBMOD		3	/* Number of MacBeth moderate colors */
-short	mbmod[NMBMOD] = {1,3,2};
-#define NMBSAT		6	/* Number of MacBeth saturated colors */
-short	mbsat[NMBSAT] = {14,12,13,15,16,17};
+short	mbneu[NMBNEU] = {Black,Neutral35,Neutral5,Neutral65,Neutral8,White};
 
+#define  NEUFLGS	(1L<<White|1L<<Neutral8|1L<<Neutral65| \
+				1L<<Neutral5|1L<<Neutral35|1L<<Black)
+
+#define  SATFLGS	(1L<<Red|1L<<Green|1L<<Blue|1L<<Magenta|1L<<Yellow| \
+			1L<<Cyan|1L<<Orange|1L<<Purple|1L<<PurplishBlue| \
+			1L<<YellowGreen|1<<OrangeYellow|1L<<BlueFlower)
+
+#define  UNSFLGS	(1L<<DarkSkin|1L<<LightSkin|1L<<BlueSky|1L<<Foliage| \
+			1L<<BluishGreen|1L<<ModerateRed)
+
+#define  REQFLGS	NEUFLGS			/* need these colors */
+#define  MODFLGS	(NEUFLGS|UNSFLGS)	/* should be in gamut */
+
+#define  RG_BORD	0	/* patch border */
+#define  RG_CENT	01	/* central region of patch */
+#define  RG_ORIG	02	/* original color region */
+#define  RG_CORR	04	/* corrected color region */
+
+int	scanning = 1;		/* scanned input (or recorded output)? */
+
 int	xmax, ymax;		/* input image dimensions */
 int	bounds[4][2];		/* image coordinates of chart corners */
 double	imgxfm[3][3];		/* coordinate transformation matrix */
 
-COLOR	picRGB[24];		/* picture colors */
+COLOR	inpRGB[24];		/* measured or scanned input colors */
+long	inpflags = 0;		/* flags of which colors were input */
+long	gmtflags = 0;		/* flags of out-of-gamut colors */
 
-double	bramp[NMBNEU][2];	/* brightness ramp */
+COLOR	bramp[NMBNEU][2];	/* brightness ramp (per primary) */
 double	solmat[3][3];		/* color mapping matrix */
 
-FILE	*debugfp = NULL;
+FILE	*debugfp = NULL;	/* debug output picture */
 char	*progname;
 
 extern char	*malloc();
@@ -78,59 +121,97 @@ char	**argv;
 	int	i;
 
 	progname = argv[0];
-	if (argc > 2 && !strcmp(argv[1], "-d")) {	/* debug output */
-		if ((debugfp = fopen(argv[2], "w")) == NULL) {
-			perror(argv[2]);
-			exit(1);
-		}
+	for (i = 1; i < argc && argv[i][0] == '-'; i++)
+		switch (argv[i][1]) {
+		case 'd':				/* debug output */
+			i++;
+			if (badarg(argc-i, argv+i, "s"))
+				goto userr;
+			if ((debugfp = fopen(argv[i], "w")) == NULL) {
+				perror(argv[i]);
+				exit(1);
+			}
 #ifdef MSDOS
-		setmode(fileno(debugfp), O_BINARY);
+			setmode(fileno(debugfp), O_BINARY);
 #endif
-		newheader("RADIANCE", debugfp);
-		printargs(argc, argv, debugfp);
-		argv += 2;
-		argc -= 2;
-	}
-	if (argc != 3 && argc != 11)
-		goto userr;
-	if (strcmp(argv[1], "-") && freopen(argv[1], "r", stdin) == NULL) {
+			newheader("RADIANCE", debugfp);		/* start */
+			printargs(argc, argv, debugfp);		/* header */
+			break;
+		case 'p':				/* picture position */
+			if (badarg(argc-i-1, argv+i+1, "iiiiiiii"))
+				goto userr;
+			bounds[0][0] = atoi(argv[++i]);
+			bounds[0][1] = atoi(argv[++i]);
+			bounds[1][0] = atoi(argv[++i]);
+			bounds[1][1] = atoi(argv[++i]);
+			bounds[2][0] = atoi(argv[++i]);
+			bounds[2][1] = atoi(argv[++i]);
+			bounds[3][0] = atoi(argv[++i]);
+			bounds[3][1] = atoi(argv[++i]);
+			scanning = 2;
+			break;
+		case 'c':				/* color input */
+			scanning = 0;
+			break;
+		default:
+			goto userr;
+		}
+							/* open files */
+	if (i < argc && freopen(argv[i], "r", stdin) == NULL) {
 		perror(argv[1]);
 		exit(1);
 	}
-	if (strcmp(argv[2], "-") && freopen(argv[2], "w", stdout) == NULL) {
+	if (i+1 < argc && freopen(argv[i+1], "w", stdout) == NULL) {
 		perror(argv[2]);
 		exit(1);
 	}
+	if (scanning) {			/* load input picture header */
 #ifdef MSDOS
-	setmode(fileno(stdin), O_BINARY);
+		setmode(fileno(stdin), O_BINARY);
 #endif
-	if (checkheader(stdin, COLRFMT, NULL) < 0 ||
-			fgetresolu(&xmax, &ymax, stdin) < 0) {
-		fprintf(stderr, "%s: bad input picture\n", progname);
-		exit(1);
-	}
-					/* get chart boundaries */
-	if (argc == 11) {
-		for (i = 0; i < 4; i++) {
-			if (!isint(argv[2*i+3]) | !isint(argv[2*i+4]))
-				goto userr;
-			bounds[i][0] = atoi(argv[2*i+3]);
-			bounds[i][1] = atoi(argv[2*i+4]);
+		if (checkheader(stdin, COLRFMT, NULL) < 0 ||
+				fgetresolu(&xmax, &ymax, stdin) < 0) {
+			fprintf(stderr, "%s: bad input picture\n", progname);
+			exit(1);
 		}
-	} else {
+	} else {			/* else set default xmax and ymax */
+		xmax = 512;
+		ymax = 2*512/3;
+	}
+	if (scanning != 2) {		/* use default boundaries */
 		bounds[0][0] = bounds[2][0] = .029*xmax + .5;
 		bounds[0][1] = bounds[1][1] = .956*ymax + .5;
 		bounds[1][0] = bounds[3][0] = .971*xmax + .5;
 		bounds[2][1] = bounds[3][1] = .056*ymax + .5;
 	}
 	init();				/* initialize */
-	getcolors();			/* get picture colors */
+	if (scanning)			/* get picture colors */
+		getpicture();
+	else
+		getcolors();
+	compute();			/* compute color mapping */
+					/* print comment */
+	printf("{\n\tColor correction file computed by:\n\t\t");
+	printargs(argc, argv, stdout);
+	printf("\n\tUsage: pcomb -f %s uncorrected.pic > corrected.pic\n",
+			i+1 < argc ? argv[i+1] : "{this_file}");
+	if (!scanning)
+		printf("\t   Or: pcond [options] -f %s orig.pic > output.pic\n",
+				i+1 < argc ? argv[i+1] : "{this_file}");
+	printf("}\n");
 	putmapping();			/* put out color mapping */
-	putdebug();			/* put out debug picture */
+	if (debugfp != NULL)		/* put out debug picture */
+		if (scanning)
+			picdebug();
+		else
+			clrdebug();
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-d dbg.pic] input.pic output.cal [xul yul xur yur xll yll xlr ylr]\n",
+	fprintf(stderr,
+"Usage: %s [-d dbg.pic][-p xul yul xur yur xll yll xlr ylr] input.pic [output.cal]\n",
 			progname);
+	fprintf(stderr, "   or: %s [-d dbg.pic] -c [xyY.dat [output.cal]]\n",
+			progname);
 	exit(1);
 }
 
@@ -138,9 +219,7 @@ userr:
 init()				/* initialize */
 {
 	double	quad[4][2];
-	COLOR	ctmp;
-	double	d;
-	int	i;
+	register int	i;
 					/* make coordinate transformation */
 	quad[0][0] = bounds[0][0];
 	quad[0][1] = bounds[0][1];
@@ -156,19 +235,15 @@ init()				/* initialize */
 		exit(1);
 	}
 					/* map MacBeth colors to RGB space */
-	for (i = 0; i < 24; i++) {
-		d = mbxyY[i][2] / mbxyY[i][1];
-		ctmp[0] = mbxyY[i][0] * d;
-		ctmp[1] = mbxyY[i][2];
-		ctmp[2] = (1. - mbxyY[i][0] - mbxyY[i][1]) * d;
-		cie_rgb(mbRGB[i], ctmp);
-	}
+	for (i = 0; i < 24; i++)
+		xyY2RGB(mbRGB[i], mbxyY[i]);
 }
 
 
 int
-chartndx(x, y)				/* find color number for position */
+chartndx(x, y, np)			/* find color number for position */
 int	x, y;
+int	*np;
 {
 	double	ipos[3], cpos[3];
 	int	ix, iy;
@@ -181,25 +256,30 @@ int	x, y;
 	cpos[0] /= cpos[2];
 	cpos[1] /= cpos[2];
 	if (cpos[0] < 0. || cpos[0] >= 6. || cpos[1] < 0. || cpos[1] >= 4.)
-		return(-1);
+		return(RG_BORD);
 	ix = cpos[0];
 	iy = cpos[1];
 	fx = cpos[0] - ix;
 	fy = cpos[1] - iy;
-	if (fx < .35 || fx >= .65 || fy < .35 || fy >= .65)
-		return(-1);
-	return(iy*6 + ix);
+	*np = iy*6 + ix;
+	if (fx >= 0.35 && fx < 0.65 && fy >= 0.35 && fy < 0.65)
+		return(RG_CENT);
+	if (fx < 0.05 || fx >= 0.95 || fy < 0.05 || fy >= 0.95)
+		return(RG_BORD);
+	if (fx >= 0.5)			/* right side is corrected */
+		return(RG_CORR);
+	return(RG_ORIG);		/* left side is original */
 }
 
 
-getcolors()				/* load in picture colors */
+getpicture()				/* load in picture colors */
 {
 	COLR	*scanln;
 	COLOR	pval;
 	int	ccount[24];
 	double	d;
-	int	y;
-	register int	x, i;
+	int	y, i;
+	register int	x;
 
 	scanln = (COLR *)malloc(xmax*sizeof(COLR));
 	if (scanln == NULL) {
@@ -207,7 +287,7 @@ getcolors()				/* load in picture colors */
 		exit(1);
 	}
 	for (i = 0; i < 24; i++) {
-		setcolor(picRGB[i], 0., 0., 0.);
+		setcolor(inpRGB[i], 0., 0., 0.);
 		ccount[i] = 0;
 	}
 	for (y = ymax-1; y >= 0; y--) {
@@ -216,101 +296,215 @@ getcolors()				/* load in picture colors */
 					progname);
 			exit(1);
 		}
-		for (x = 0; x < xmax; x++) {
-			i = chartndx(x, y);
-			if (i >= 0) {
+		for (x = 0; x < xmax; x++)
+			if (chartndx(x, y, &i) == RG_CENT) {
 				colr_color(pval, scanln[x]);
-				addcolor(picRGB[i], pval);
+				addcolor(inpRGB[i], pval);
 				ccount[i]++;
 			}
+	}
+	for (i = 0; i < 24; i++) {		/* compute averages */
+		if (ccount[i] == 0)
+			continue;
+		d = 1./ccount[i];
+		scalecolor(inpRGB[i], d);
+		inpflags |= 1L<<i;
+	}
+	free((char *)scanln);
+}
+
+
+getcolors()			/* get xyY colors from standard input */
+{
+	int	gotwhite = 0;
+	COLOR	whiteclr;
+	int	n;
+	float	xyYin[3];
+
+	while (fgetval(stdin, 'i', &n) == 1) {		/* read colors */
+		if (n < 0 | n > 24 ||
+				fgetval(stdin, 'f', &xyYin[0]) != 1 ||
+				fgetval(stdin, 'f', &xyYin[1]) != 1 ||
+				fgetval(stdin, 'f', &xyYin[2]) != 1 ||
+				xyYin[0] < 0. | xyYin[1] < 0. ||
+				xyYin[0] + xyYin[1] > 1.) {
+			fprintf(stderr, "%s: bad color input data\n",
+					progname);
+			exit(1);
 		}
+		if (n == 0) {				/* calibration white */
+			xyY2RGB(whiteclr, xyYin);
+			gotwhite++;
+		} else {				/* standard color */
+			n--;
+			xyY2RGB(inpRGB[n], xyYin);
+			inpflags |= 1L<<n;
+		}
 	}
-	for (i = 0; i < 24; i++) {
-		if (ccount[i] == 0) {
-			fprintf(stderr, "%s: bad chart boundaries\n",
+					/* normalize colors */
+	if (!gotwhite) {
+		if (!(inpflags & 1L<<White)) {
+			fprintf(stderr, "%s: missing input for White\n",
 					progname);
 			exit(1);
 		}
-		d = 1.0/ccount[i];
-		scalecolor(picRGB[i], d);
+		setcolor(whiteclr,
+			colval(inpRGB[White],RED)/colval(mbRGB[White],RED),
+			colval(inpRGB[White],GRN)/colval(mbRGB[White],GRN),
+			colval(inpRGB[White],BLU)/colval(mbRGB[White],BLU));
 	}
-	free((char *)scanln);
+	for (n = 0; n < 24; n++)
+		if (inpflags & 1L<<n)
+			setcolor(inpRGB[n],
+				colval(inpRGB[n],RED)/colval(whiteclr,RED),
+				colval(inpRGB[n],GRN)/colval(whiteclr,GRN),
+				colval(inpRGB[n],BLU)/colval(whiteclr,BLU));
 }
 
 
-double
-bresp(x)		/* piecewise linear interpolation of brightness */
-double	x;
+bresp(y, x)		/* piecewise linear interpolation of primaries */
+COLOR	y, x;
 {
-	register int	n = NMBNEU;
+	register int	i, n;
 
-	while (n > 0 && x < bramp[--n][0])
-		;
-	return( ((bramp[n+1][0] - x)*bramp[n][1] +
-				(x - bramp[n][0])*bramp[n+1][1]) /
-			(bramp[n+1][0] - bramp[n][0]) );
+	for (i = 0; i < 3; i++) {
+		for (n = 0; n < NMBNEU-2; n++)
+			if (colval(x,i) < colval(bramp[n+1][0],i))
+				break;
+		colval(y,i) = ((colval(bramp[n+1][0],i) - colval(x,i)) *
+						colval(bramp[n][1],i) +
+				(colval(x,i) - colval(bramp[n][0],i)) *
+						colval(bramp[n+1][1],i)) /
+			(colval(bramp[n+1][0],i) - colval(bramp[n][0],i));
+	}
 }
 
 
-putmapping()			/* compute and print mapping for pcomb -f */
+compute()			/* compute color mapping */
 {
-	float	clrin[NMBMOD][3], clrout[NMBMOD][3];
-	register int	i, j;
+	COLOR	clrin[24], clrout[24];
+	long	cflags;
+	COLOR	ctmp;
+	register int	i, j, n;
+					/* did we get what we need? */
+	if ((inpflags & REQFLGS) != REQFLGS) {
+		fprintf(stderr, "%s: missing required input colors\n",
+				progname);
+		exit(1);
+	}
 					/* compute piecewise luminance curve */
 	for (i = 0; i < NMBNEU; i++) {
-		bramp[i][0] = bright(picRGB[mbneu[i]]);
-		bramp[i][1] = bright(mbRGB[mbneu[i]]);
+		copycolor(bramp[i][0], inpRGB[mbneu[i]]);
+		copycolor(bramp[i][1], mbRGB[mbneu[i]]);
 	}
-					/* compute color matrix */
-	for (i = 0; i < NMBMOD; i++)
-		for (j = 0; j < 3; j++) {
-			clrin[i][j] = bresp(picRGB[mbmod[i]][j]);
-			clrout[i][j] = mbRGB[mbmod[i]][j];
-		}
-	compsoln(clrin, clrout, NMBMOD);
+					/* compute color mapping */
+	do {
+		cflags = inpflags & ~gmtflags;
+		n = 0;				/* compute transform matrix */
+		for (i = 0; i < 24; i++)
+			if (cflags & 1L<<i) {
+				bresp(clrin[n], inpRGB[i]);
+				copycolor(clrout[n], mbRGB[i]);
+				n++;
+			}
+		compsoln(clrin, clrout, n);
+						/* check out-of-gamut colors */
+		for (i = 0; i < 24; i++)
+			if (cflags & 1L<<i) {
+				cvtcolor(ctmp, mbRGB[i]);
+				for (j = 0; j < 3; j++)
+					if (colval(ctmp,j) <= 1e-6 ||
+						colval(ctmp,j) >= 1.-1e-6) {
+						gmtflags |= 1L<<i;
+						break;
+					}
+			}
+	} while (cflags & gmtflags);
+	if (gmtflags & MODFLGS)
+		fprintf(stderr,
+		"%s: warning - some moderate colors are out of gamut\n",
+				progname);
+}
+
+
+putmapping()			/* put out color mapping for pcomb -f */
+{
+	static char	cchar[3] = {'r', 'g', 'b'};
+	register int	i, j;
 					/* print brightness mapping */
-	printf("xval(i) : select(i, 0");
-	for (i = 0; i < NMBNEU; i++)
-		printf(", %g", bramp[i][0]);
-	printf(");\n");
-	printf("yval(i) : select(i, 0");
-	for (i = 0; i < NMBNEU; i++)
-		printf(", %g", bramp[i][1]);
-	printf(");\n");
-	printf("ifind(x,f,n) : if(1.5-n, 1, if(x-f(n), n, ifind(x,f,n-1)));\n");
-	printf("binterp(i,x) : ((xval(i+1)-x)*yval(i) + (x-xval(i))*yval(i+1))/\n");
-	printf("\t\t(xval(i+1) - xval(i));\n");
-	printf("bresp(x) : binterp(ifind(x,xval,xval(0)-1), x);\n");
-	printf("nred = bresp(ri(1));\n");
-	printf("ngrn = bresp(gi(1));\n");
-	printf("nblu = bresp(bi(1));\n");
+	for (j = 0; j < 3; j++) {
+		printf("%cxa(i) : select(i", cchar[j]);
+		for (i = 0; i < NMBNEU; i++)
+			printf(",%g", colval(bramp[i][0],j));
+		printf(");\n");
+		printf("%cya(i) : select(i", cchar[j]);
+		for (i = 0; i < NMBNEU; i++)
+			printf(",%g", colval(bramp[i][1],j));
+		printf(");\n");
+		printf("%cfi(n) = if(n-%g, %d, if(%cxa(n+1)-%c, n, %cfi(n+1)));\n",
+				cchar[j], NMBNEU-1.5, NMBNEU-1, cchar[j],
+				cchar[j], cchar[j]);
+		printf("%cndx = %cfi(1);\n", cchar[j], cchar[j]);
+		printf("%c%c = ((%cxa(%cndx+1)-%c)*%cya(%cndx) + ",
+				cchar[j], scanning?'n':'o', cchar[j],
+				cchar[j], cchar[j], cchar[j], cchar[j]);
+		printf("(%c-%cxa(%cndx))*%cya(%cndx+1)) /\n",
+				cchar[j], cchar[j], cchar[j],
+				cchar[j], cchar[j]);
+		printf("\t\t(%cxa(%cndx+1) - %cxa(%cndx)) ;\n",
+				cchar[j], cchar[j], cchar[j], cchar[j]);
+	}
 					/* print color mapping */
-	printf("ro = %g*nred + %g*ngrn + %g*nblu\n",
-			solmat[0][0], solmat[1][0], solmat[2][0]);
-	printf("go = %g*nred + %g*ngrn + %g*nblu\n",
-			solmat[0][1], solmat[1][1], solmat[2][1]);
-	printf("bo = %g*nred + %g*ngrn + %g*nblu\n",
-			solmat[0][2], solmat[1][2], solmat[2][2]);
+	if (scanning) {
+		printf("r = ri(1); g = gi(1); b = bi(1);\n");
+		printf("ro = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[0][0], solmat[0][1], solmat[0][2]);
+		printf("go = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[1][0], solmat[1][1], solmat[1][2]);
+		printf("bo = %g*rn + %g*gn + %g*bn ;\n",
+				solmat[2][0], solmat[2][1], solmat[2][2]);
+	} else {
+		printf("r1 = ri(1); g1 = gi(1); b1 = bi(1);\n");
+		printf("r = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[0][0], solmat[0][1], solmat[0][2]);
+		printf("g = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[1][0], solmat[1][1], solmat[1][2]);
+		printf("b = %g*r1 + %g*g1 + %g*b1 ;\n",
+				solmat[2][0], solmat[2][1], solmat[2][2]);
+	}
 }
 
 
-compsoln(cin, cout, n)		/* solve 3x3 system */
-float	cin[][3], cout[][3];
+compsoln(cin, cout, n)		/* solve 3xN system using least-squares */
+COLOR	cin[], cout[];
 int	n;
 {
 	extern double	mx3d_adjoint(), fabs();
 	double	mat[3][3], invmat[3][3];
 	double	det;
 	double	colv[3], rowv[3];
-	register int	i, j;
+	register int	i, j, k;
 
-	if (n != 3) {
-		fprintf(stderr, "%s: inconsistent code!\n", progname);
+	if (n < 3) {
+		fprintf(stderr, "%s: too few colors to match!\n", progname);
 		exit(1);
 	}
-	for (i = 0; i < 3; i++)
-		for (j = 0; j < 3; j++)
-			mat[i][j] = cin[j][i];
+	if (n == 3)
+		for (i = 0; i < 3; i++)
+			for (j = 0; j < 3; j++)
+				mat[i][j] = colval(cin[j],i);
+	else {				/* compute A^t A */
+		for (i = 0; i < 3; i++)
+			for (j = i; j < 3; j++) {
+				mat[i][j] = 0.;
+				for (k = 0; k < n; k++)
+					mat[i][j] += colval(cin[k],i) *
+							colval(cin[k],j);
+			}
+		for (i = 1; i < 3; i++)		/* using symmetry */
+			for (j = 0; j < i; j++)
+				mat[i][j] = mat[j][i];
+	}
 	det = mx3d_adjoint(mat, invmat);
 	if (fabs(det) < 1e-4) {
 		fprintf(stderr, "%s: cannot compute color mapping\n",
@@ -324,11 +518,19 @@ int	n;
 		for (j = 0; j < 3; j++)
 			invmat[i][j] /= det;
 	for (i = 0; i < 3; i++) {
+		if (n == 3)
+			for (j = 0; j < 3; j++)
+				colv[j] = colval(cout[j],i);
+		else
+			for (j = 0; j < 3; j++) {
+				colv[j] = 0.;
+				for (k = 0; k < n; k++)
+					colv[j] += colval(cout[k],i) *
+							colval(cin[k],j);
+			}
+		mx3d_transform(colv, invmat, rowv);
 		for (j = 0; j < 3; j++)
-			rowv[j] = cout[j][i];
-		mx3d_transform(rowv, invmat, colv);
-		for (j = 0; j < 3; j++)
-			solmat[j][i] = colv[j];
+			solmat[i][j] = rowv[j];
 	}
 }
 
@@ -336,30 +538,63 @@ int	n;
 cvtcolor(cout, cin)		/* convert color according to our mapping */
 COLOR	cout, cin;
 {
+	COLOR	ctmp;
+
+	if (scanning) {
+		bresp(ctmp, cin);
+		cresp(cout, ctmp);
+	} else {
+		cresp(ctmp, cin);
+		bresp(cout, ctmp);
+	}
+	if (colval(cout,RED) < 0.)
+		colval(cout,RED) = 0.;
+	if (colval(cout,GRN) < 0.)
+		colval(cout,GRN) = 0.;
+	if (colval(cout,BLU) < 0.)
+		colval(cout,BLU) = 0.;
+}
+
+
+cresp(cout, cin)		/* transform color according to matrix */
+COLOR	cout, cin;
+{
 	double	r, g, b;
-	double	r1, g1, b1;
 
-	r = bresp(colval(cin,RED));
-	g = bresp(colval(cin,GRN));
-	b = bresp(colval(cin,BLU));
-	r1 = r*solmat[0][0] + g*solmat[1][0] + b*solmat[2][0];
-	if (r1 < 0) r1 = 0;
-	g1 = r*solmat[0][1] + g*solmat[1][1] + b*solmat[2][1];
-	if (g1 < 0) g1 = 0;
-	b1 = r*solmat[0][2] + g*solmat[1][2] + b*solmat[2][2];
-	if (b1 < 0) b1 = 0;
-	setcolor(cout, r1, g1, b1);
+	r = colval(cin,0)*solmat[0][0] + colval(cin,1)*solmat[0][1]
+			+ colval(cin,2)*solmat[0][2];
+	g = colval(cin,0)*solmat[1][0] + colval(cin,1)*solmat[1][1]
+			+ colval(cin,2)*solmat[1][2];
+	b = colval(cin,0)*solmat[2][0] + colval(cin,1)*solmat[2][1]
+			+ colval(cin,2)*solmat[2][2];
+	setcolor(cout, r, g, b);
 }
 
 
-putdebug()			/* put out debugging picture */
+xyY2RGB(rgbout, xyYin)		/* convert xyY to RGB */
+COLOR	rgbout;
+register float	xyYin[3];
 {
+	COLOR	ctmp;
+	double	d;
+
+	d = xyYin[2] / xyYin[1];
+	ctmp[0] = xyYin[0] * d;
+	ctmp[1] = xyYin[2];
+	ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d;
+	cie_rgb(rgbout, ctmp);
+				/* allow negative values */
+	colortrans(rgbout, xyz2rgbmat, ctmp, 0);
+}
+
+
+picdebug()			/* put out debugging picture */
+{
+	static COLOR	blkcol = BLKCOLOR;
 	COLOR	*scan;
-	int	y;
-	register int	x, i;
+	int	y, i;
+	register int	x, rg;
 
-	if (debugfp == NULL)
-		return;
 	if (fseek(stdin, 0L, 0) == EOF) {
 		fprintf(stderr, "%s: cannot seek on input picture\n", progname);
 		exit(1);
@@ -373,8 +608,10 @@ putdebug()			/* put out debugging picture */
 		exit(1);
 	}
 						/* finish debug header */
+	fputformat(COLRFMT, debugfp);
 	putc('\n', debugfp);
 	fprtresolu(xmax, ymax, debugfp);
+						/* write debug picture */
 	for (y = ymax-1; y >= 0; y--) {
 		if (freadscan(scan, xmax, stdin) < 0) {
 			fprintf(stderr, "%s: error rereading input picture\n",
@@ -382,11 +619,16 @@ putdebug()			/* put out debugging picture */
 			exit(1);
 		}
 		for (x = 0; x < xmax; x++) {
-			i = chartndx(x, y);
-			if (i < 0)
+			rg = chartndx(x, y, &i);
+			if (rg == RG_CENT) {
+				if (!(1L<<i & gmtflags) || (x+y)&07)
+					copycolor(scan[x], mbRGB[i]);
+				else
+					copycolor(scan[x], blkcol);
+			} else if (rg == RG_CORR)
 				cvtcolor(scan[x], scan[x]);
-			else
-				copycolor(scan[x], mbRGB[i]);
+			else if (rg != RG_ORIG)
+				copycolor(scan[x], blkcol);
 		}
 		if (fwritescan(scan, xmax, debugfp) < 0) {
 			fprintf(stderr, "%s: error writing debugging picture\n",
@@ -394,5 +636,66 @@ putdebug()			/* put out debugging picture */
 			exit(1);
 		}
 	}
+						/* clean up */
+	fclose(debugfp);
+	free((char *)scan);
+}
+
+
+clrdebug()			/* put out debug picture from color input */
+{
+	static COLR	blkclr = BLKCOLR;
+	COLR	mbclr[24], cvclr[24], orclr[24];
+	COLR	*scan;
+	COLOR	ctmp;
+	int	y, i;
+	register int	x, rg;
+						/* convert colors */
+	for (i = 0; i < 24; i++) {
+		setcolr(mbclr[i], colval(mbRGB[i],RED),
+				colval(mbRGB[i],GRN), colval(mbRGB[i],BLU));
+		if (inpflags & 1L<<i) {
+			setcolr(orclr[i], colval(inpRGB[i],RED),
+					colval(inpRGB[i],GRN),
+					colval(inpRGB[i],BLU));
+			cvtcolor(ctmp, inpRGB[i]);
+			setcolr(cvclr[i], colval(ctmp,RED),
+					colval(ctmp,GRN), colval(ctmp,BLU));
+		}
+	}
+						/* allocate scanline */
+	scan = (COLR *)malloc(xmax*sizeof(COLR));
+	if (scan == NULL) {
+		perror(progname);
+		exit(1);
+	}
+						/* finish debug header */
+	fputformat(COLRFMT, debugfp);
+	putc('\n', debugfp);
+	fprtresolu(xmax, ymax, debugfp);
+						/* write debug picture */
+	for (y = ymax-1; y >= 0; y--) {
+		for (x = 0; x < xmax; x++) {
+			rg = chartndx(x, y, &i);
+			if (rg == RG_CENT) {
+				if (!(1L<<i & gmtflags) || (x+y)&07)
+					copycolr(scan[x], mbclr[i]);
+				else
+					copycolr(scan[x], blkclr);
+			} else if (rg == RG_BORD || !(1L<<i & inpflags))
+				copycolr(scan[x], blkclr);
+			else if (rg == RG_ORIG)
+				copycolr(scan[x], orclr[i]);
+			else /* rg == RG_CORR */
+				copycolr(scan[x], cvclr[i]);
+		}
+		if (fwritecolrs(scan, xmax, debugfp) < 0) {
+			fprintf(stderr, "%s: error writing debugging picture\n",
+					progname);
+			exit(1);
+		}
+	}
+						/* clean up */
+	fclose(debugfp);
 	free((char *)scan);
 }